From 2642ffe43c12ef8228c91f8d08f8a22a4f4dc5f8 Mon Sep 17 00:00:00 2001
From: Dimitry <dimitry@ethereum.org>
Date: Tue, 13 Nov 2018 00:35:53 +0300
Subject: fill as blockchain sstore combinations

---
 .../sstore_combinations_initial0_d0g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1000g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1001g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1002g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1003g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1004g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1005g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1006g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1007g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1008g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1009g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d100g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1010g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1011g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1012g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1013g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1014g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1015g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1016g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1017g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1018g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1019g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d101g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1020g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1021g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1022g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1023g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1024g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1025g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1026g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1027g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1028g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1029g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d102g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1030g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1031g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1032g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1033g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1034g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1035g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1036g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1037g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1038g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1039g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d103g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1040g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1041g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1042g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1043g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1044g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1045g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1046g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1047g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1048g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1049g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d104g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1050g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1051g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1052g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1053g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1054g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1055g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1056g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1057g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1058g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1059g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d105g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1060g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1061g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1062g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1063g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1064g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1065g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1066g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1067g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1068g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1069g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d106g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1070g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1071g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1072g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1073g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1074g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1075g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1076g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1077g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1078g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1079g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d107g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1080g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1081g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1082g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1083g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1084g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1085g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1086g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1087g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1088g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1089g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d108g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1090g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1091g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1092g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1093g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1094g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1095g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1096g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1097g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1098g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1099g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d109g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d10g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1100g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1101g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1102g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1103g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1104g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1105g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1106g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1107g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1108g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1109g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d110g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1110g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1111g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1112g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1113g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1114g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1115g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1116g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1117g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1118g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1119g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d111g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1120g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1121g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1122g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1123g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1124g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1125g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1126g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1127g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1128g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1129g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d112g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1130g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1131g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1132g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1133g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1134g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1135g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1136g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1137g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1138g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1139g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d113g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1140g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1141g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1142g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1143g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1144g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1145g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1146g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1147g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1148g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1149g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d114g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1150g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1151g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1152g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1153g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1154g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1155g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1156g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1157g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1158g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1159g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d115g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1160g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1161g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1162g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1163g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1164g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1165g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1166g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1167g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1168g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1169g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d116g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1170g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1171g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1172g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1173g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1174g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1175g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1176g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1177g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1178g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1179g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d117g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1180g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1181g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1182g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1183g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1184g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1185g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1186g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1187g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1188g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1189g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d118g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1190g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1191g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1192g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1193g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1194g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1195g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1196g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1197g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1198g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1199g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d119g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d11g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1200g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1201g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1202g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1203g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1204g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1205g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1206g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1207g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1208g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1209g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d120g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1210g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1211g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1212g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1213g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1214g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1215g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1216g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1217g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1218g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1219g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d121g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1220g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1221g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1222g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1223g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1224g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1225g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1226g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1227g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1228g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1229g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d122g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1230g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1231g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1232g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1233g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1234g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1235g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1236g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1237g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1238g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1239g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d123g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1240g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1241g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1242g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1243g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1244g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1245g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1246g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1247g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1248g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1249g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d124g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1250g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1251g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1252g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1253g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1254g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1255g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1256g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1257g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1258g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1259g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d125g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1260g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1261g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1262g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1263g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1264g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1265g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1266g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1267g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1268g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1269g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d126g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1270g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1271g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1272g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1273g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1274g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1275g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1276g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1277g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1278g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1279g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d127g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1280g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1281g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1282g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1283g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1284g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1285g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1286g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1287g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1288g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1289g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d128g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1290g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1291g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1292g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1293g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1294g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1295g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1296g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1297g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1298g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1299g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d129g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d12g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1300g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1301g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1302g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1303g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1304g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1305g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1306g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1307g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1308g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1309g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d130g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1310g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1311g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1312g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1313g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1314g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1315g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1316g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1317g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1318g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1319g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d131g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1320g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1321g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1322g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1323g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1324g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1325g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1326g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1327g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1328g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1329g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d132g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1330g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1331g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1332g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1333g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1334g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1335g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1336g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1337g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1338g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1339g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d133g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1340g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1341g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1342g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1343g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1344g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1345g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1346g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1347g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1348g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1349g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d134g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1350g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1351g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1352g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1353g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1354g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1355g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1356g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1357g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1358g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1359g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d135g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1360g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1361g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1362g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1363g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1364g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1365g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1366g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1367g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1368g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1369g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d136g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1370g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1371g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1372g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1373g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1374g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1375g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1376g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1377g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1378g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1379g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d137g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1380g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1381g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1382g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1383g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1384g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1385g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1386g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1387g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1388g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1389g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d138g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1390g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1391g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1392g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1393g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1394g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1395g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1396g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1397g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1398g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1399g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d139g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d13g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1400g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1401g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1402g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1403g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1404g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1405g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1406g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1407g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1408g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1409g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d140g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1410g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1411g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1412g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1413g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1414g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1415g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1416g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1417g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1418g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1419g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d141g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1420g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1421g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1422g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1423g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1424g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1425g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1426g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1427g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1428g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1429g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d142g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1430g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1431g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1432g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1433g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1434g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1435g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1436g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1437g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1438g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1439g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d143g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1440g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1441g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1442g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1443g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1444g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1445g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1446g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1447g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1448g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1449g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d144g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1450g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1451g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1452g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1453g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1454g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1455g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1456g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1457g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1458g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1459g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d145g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1460g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1461g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1462g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1463g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1464g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1465g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1466g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1467g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1468g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1469g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d146g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1470g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1471g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1472g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1473g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1474g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1475g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1476g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1477g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1478g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1479g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d147g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1480g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1481g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1482g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1483g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1484g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1485g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1486g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1487g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1488g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1489g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d148g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1490g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1491g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1492g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1493g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1494g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1495g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1496g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1497g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1498g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1499g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d149g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d14g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1500g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1501g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1502g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1503g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1504g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1505g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1506g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1507g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1508g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1509g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d150g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1510g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1511g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1512g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1513g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1514g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1515g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1516g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1517g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1518g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1519g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d151g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1520g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1521g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1522g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1523g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1524g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1525g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1526g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1527g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1528g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1529g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d152g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1530g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1531g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1532g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1533g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1534g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1535g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1536g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1537g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1538g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1539g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d153g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1540g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1541g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1542g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1543g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1544g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1545g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1546g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1547g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1548g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1549g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d154g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1550g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1551g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1552g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1553g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1554g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1555g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1556g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1557g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1558g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1559g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d155g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1560g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1561g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1562g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1563g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1564g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1565g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1566g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1567g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1568g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1569g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d156g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1570g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1571g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1572g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1573g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1574g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1575g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1576g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1577g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1578g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1579g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d157g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1580g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1581g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1582g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1583g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1584g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1585g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1586g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1587g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1588g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1589g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d158g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1590g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1591g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1592g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1593g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1594g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1595g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1596g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1597g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1598g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1599g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d159g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d15g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1600g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1601g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1602g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1603g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1604g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1605g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1606g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1607g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1608g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1609g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d160g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1610g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1611g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1612g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1613g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1614g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1615g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1616g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1617g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1618g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1619g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d161g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1620g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1621g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1622g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1623g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1624g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1625g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1626g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1627g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1628g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1629g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d162g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1630g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1631g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1632g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1633g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1634g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1635g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1636g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1637g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1638g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1639g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d163g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1640g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1641g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1642g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1643g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1644g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1645g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1646g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1647g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1648g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1649g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d164g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1650g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1651g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1652g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1653g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1654g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1655g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1656g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1657g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1658g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1659g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d165g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1660g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1661g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1662g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1663g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1664g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1665g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1666g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1667g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1668g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1669g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d166g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1670g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1671g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1672g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1673g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1674g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1675g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1676g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1677g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1678g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1679g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d167g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1680g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1681g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1682g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1683g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1684g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1685g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1686g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1687g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1688g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1689g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d168g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1690g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1691g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1692g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1693g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1694g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1695g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1696g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1697g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1698g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1699g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d169g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d16g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1700g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1701g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1702g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1703g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1704g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1705g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1706g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1707g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1708g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1709g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d170g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1710g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1711g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1712g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1713g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1714g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1715g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1716g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1717g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1718g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1719g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d171g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1720g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1721g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1722g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1723g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1724g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1725g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1726g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1727g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial0_d1728g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d172g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d173g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d174g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d175g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d176g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d177g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d178g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d179g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d17g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d180g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d181g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d182g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d183g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d184g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d185g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d186g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d187g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d188g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d189g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d18g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d190g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d191g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d192g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d193g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d194g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d195g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d196g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d197g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d198g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d199g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d19g0v0Filler.json | 128 +++++++++++++++++++++
 .../sstore_combinations_initial0_d1g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d200g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d201g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d202g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d203g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d204g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d205g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d206g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d207g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d208g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d209g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d20g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d210g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d211g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d212g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d213g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d214g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d215g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d216g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d217g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d218g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d219g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d21g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d220g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d221g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d222g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d223g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d224g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d225g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d226g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d227g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d228g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d229g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d22g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d230g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d231g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d232g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d233g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d234g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d235g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d236g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d237g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d238g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d239g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d23g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d240g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d241g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d242g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d243g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d244g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d245g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d246g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d247g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d248g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d249g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d24g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d250g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d251g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d252g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d253g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d254g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d255g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d256g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d257g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d258g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d259g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d25g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d260g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d261g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d262g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d263g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d264g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d265g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d266g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d267g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d268g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d269g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d26g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d270g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d271g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d272g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d273g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d274g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d275g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d276g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d277g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d278g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d279g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d27g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d280g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d281g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d282g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d283g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d284g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d285g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d286g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d287g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d288g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d289g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d28g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d290g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d291g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d292g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d293g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d294g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d295g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d296g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d297g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d298g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d299g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d29g0v0Filler.json | 128 +++++++++++++++++++++
 .../sstore_combinations_initial0_d2g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d300g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d301g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d302g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d303g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d304g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d305g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d306g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d307g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d308g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d309g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d30g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d310g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d311g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d312g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d313g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d314g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d315g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d316g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d317g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d318g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d319g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d31g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d320g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d321g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d322g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d323g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d324g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d325g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d326g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d327g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d328g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d329g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d32g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d330g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d331g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d332g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d333g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d334g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d335g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d336g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d337g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d338g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d339g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d33g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d340g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d341g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d342g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d343g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d344g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d345g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d346g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d347g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d348g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d349g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d34g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d350g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d351g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d352g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d353g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d354g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d355g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d356g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d357g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d358g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d359g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d35g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d360g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d361g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d362g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d363g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d364g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d365g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d366g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d367g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d368g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d369g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d36g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d370g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d371g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d372g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d373g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d374g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d375g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d376g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d377g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d378g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d379g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d37g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d380g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d381g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d382g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d383g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d384g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d385g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d386g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d387g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d388g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d389g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d38g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d390g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d391g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d392g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d393g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d394g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d395g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d396g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d397g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d398g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d399g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d39g0v0Filler.json | 128 +++++++++++++++++++++
 .../sstore_combinations_initial0_d3g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d400g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d401g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d402g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d403g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d404g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d405g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d406g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d407g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d408g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d409g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d40g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d410g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d411g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d412g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d413g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d414g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d415g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d416g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d417g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d418g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d419g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d41g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d420g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d421g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d422g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d423g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d424g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d425g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d426g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d427g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d428g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d429g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d42g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d430g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d431g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d432g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d433g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d434g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d435g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d436g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d437g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d438g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d439g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d43g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d440g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d441g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d442g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d443g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d444g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d445g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d446g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d447g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d448g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d449g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d44g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d450g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d451g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d452g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d453g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d454g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d455g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d456g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d457g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d458g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d459g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d45g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d460g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d461g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d462g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d463g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d464g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d465g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d466g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d467g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d468g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d469g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d46g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d470g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d471g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d472g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d473g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d474g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d475g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d476g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d477g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d478g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d479g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d47g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d480g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d481g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d482g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d483g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d484g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d485g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d486g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d487g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d488g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d489g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d48g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d490g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d491g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d492g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d493g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d494g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d495g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d496g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d497g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d498g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d499g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d49g0v0Filler.json | 128 +++++++++++++++++++++
 .../sstore_combinations_initial0_d4g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d500g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d501g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d502g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d503g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d504g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d505g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d506g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d507g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d508g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d509g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d50g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d510g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d511g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d512g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d513g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d514g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d515g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d516g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d517g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d518g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d519g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d51g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d520g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d521g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d522g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d523g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d524g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d525g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d526g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d527g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d528g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d529g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d52g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d530g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d531g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d532g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d533g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d534g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d535g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d536g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d537g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d538g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d539g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d53g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d540g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d541g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d542g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d543g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d544g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d545g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d546g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d547g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d548g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d549g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d54g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d550g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d551g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d552g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d553g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d554g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d555g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d556g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d557g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d558g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d559g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d55g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d560g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d561g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d562g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d563g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d564g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d565g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d566g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d567g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d568g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d569g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d56g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d570g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d571g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d572g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d573g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d574g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d575g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d576g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d577g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d578g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d579g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d57g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d580g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d581g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d582g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d583g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d584g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d585g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d586g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d587g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d588g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d589g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d58g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d590g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d591g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d592g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d593g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d594g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d595g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d596g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d597g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d598g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d599g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d59g0v0Filler.json | 128 +++++++++++++++++++++
 .../sstore_combinations_initial0_d5g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d600g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d601g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d602g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d603g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d604g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d605g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d606g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d607g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d608g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d609g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d60g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d610g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d611g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d612g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d613g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d614g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d615g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d616g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d617g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d618g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d619g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d61g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d620g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d621g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d622g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d623g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d624g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d625g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d626g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d627g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d628g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d629g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d62g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d630g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d631g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d632g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d633g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d634g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d635g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d636g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d637g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d638g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d639g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d63g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d640g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d641g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d642g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d643g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d644g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d645g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d646g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d647g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d648g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d649g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d64g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d650g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d651g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d652g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d653g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d654g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d655g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d656g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d657g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d658g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d659g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d65g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d660g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d661g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d662g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d663g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d664g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d665g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d666g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d667g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d668g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d669g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d66g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d670g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d671g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d672g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d673g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d674g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d675g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d676g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d677g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d678g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d679g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d67g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d680g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d681g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d682g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d683g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d684g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d685g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d686g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d687g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d688g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d689g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d68g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d690g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d691g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d692g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d693g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d694g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d695g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d696g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d697g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d698g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d699g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d69g0v0Filler.json | 128 +++++++++++++++++++++
 .../sstore_combinations_initial0_d6g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d700g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d701g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d702g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d703g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d704g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d705g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d706g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d707g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d708g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d709g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d70g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d710g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d711g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d712g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d713g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d714g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d715g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d716g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d717g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d718g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d719g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d71g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d720g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d721g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d722g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d723g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d724g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d725g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d726g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d727g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d728g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d729g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d72g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d730g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d731g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d732g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d733g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d734g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d735g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d736g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d737g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d738g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d739g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d73g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d740g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d741g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d742g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d743g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d744g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d745g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d746g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d747g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d748g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d749g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d74g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d750g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d751g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d752g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d753g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d754g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d755g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d756g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d757g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d758g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d759g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d75g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d760g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d761g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d762g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d763g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d764g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d765g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d766g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d767g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d768g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d769g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d76g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d770g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d771g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d772g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d773g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d774g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d775g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d776g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d777g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d778g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d779g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d77g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d780g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d781g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d782g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d783g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d784g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d785g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d786g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d787g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d788g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d789g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d78g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d790g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d791g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d792g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d793g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d794g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d795g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d796g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d797g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d798g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d799g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d79g0v0Filler.json | 128 +++++++++++++++++++++
 .../sstore_combinations_initial0_d7g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d800g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d801g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d802g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d803g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d804g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d805g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d806g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d807g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d808g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d809g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d80g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d810g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d811g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d812g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d813g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d814g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d815g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d816g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d817g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d818g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d819g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d81g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d820g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d821g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d822g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d823g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d824g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d825g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d826g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d827g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d828g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d829g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d82g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d830g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d831g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d832g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d833g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d834g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d835g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d836g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d837g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d838g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d839g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d83g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d840g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d841g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d842g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d843g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d844g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d845g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d846g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d847g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d848g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d849g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d84g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d850g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d851g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d852g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d853g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d854g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d855g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d856g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d857g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d858g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d859g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d85g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d860g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d861g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d862g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d863g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d864g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d865g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d866g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d867g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d868g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d869g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d86g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d870g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d871g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d872g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d873g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d874g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d875g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d876g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d877g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d878g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d879g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d87g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d880g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d881g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d882g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d883g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d884g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d885g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d886g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d887g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d888g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d889g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d88g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d890g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d891g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d892g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d893g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d894g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d895g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d896g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d897g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d898g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d899g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d89g0v0Filler.json | 128 +++++++++++++++++++++
 .../sstore_combinations_initial0_d8g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d900g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d901g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d902g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d903g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d904g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d905g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d906g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d907g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d908g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d909g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d90g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d910g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d911g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d912g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d913g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d914g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d915g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d916g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d917g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d918g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d919g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d91g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d920g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d921g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d922g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d923g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d924g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d925g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d926g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d927g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d928g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d929g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d92g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d930g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d931g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d932g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d933g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d934g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d935g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d936g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d937g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d938g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d939g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d93g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d940g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d941g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d942g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d943g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d944g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d945g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d946g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d947g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d948g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d949g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d94g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d950g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d951g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d952g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d953g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d954g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d955g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d956g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d957g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d958g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d959g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d95g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d960g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d961g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d962g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d963g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d964g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d965g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d966g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d967g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d968g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d969g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d96g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d970g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d971g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d972g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d973g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d974g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d975g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d976g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d977g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d978g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d979g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d97g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d980g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d981g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d982g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d983g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d984g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d985g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d986g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d987g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d988g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d989g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d98g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d990g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d991g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d992g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d993g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d994g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d995g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d996g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d997g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d998g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial0_d999g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial0_d99g0v0Filler.json | 128 +++++++++++++++++++++
 .../sstore_combinations_initial0_d9g0v0Filler.json | 128 +++++++++++++++++++++
 .../sstore_combinations_initial1_d0g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1000g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1001g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1002g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1003g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1004g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1005g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1006g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1007g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1008g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1009g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d100g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1010g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1011g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1012g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1013g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1014g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1015g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1016g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1017g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1018g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1019g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d101g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1020g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1021g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1022g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1023g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1024g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1025g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1026g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1027g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1028g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1029g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d102g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1030g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1031g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1032g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1033g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1034g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1035g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1036g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1037g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1038g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1039g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d103g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1040g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1041g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1042g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1043g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1044g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1045g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1046g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1047g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1048g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1049g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d104g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1050g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1051g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1052g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1053g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1054g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1055g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1056g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1057g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1058g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1059g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d105g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1060g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1061g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1062g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1063g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1064g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1065g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1066g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1067g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1068g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1069g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d106g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1070g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1071g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1072g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1073g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1074g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1075g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1076g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1077g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1078g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1079g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d107g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1080g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1081g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1082g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1083g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1084g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1085g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1086g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1087g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1088g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1089g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d108g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1090g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1091g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1092g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1093g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1094g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1095g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1096g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1097g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1098g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1099g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d109g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d10g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1100g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1101g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1102g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1103g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1104g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1105g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1106g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1107g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1108g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1109g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d110g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1110g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1111g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1112g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1113g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1114g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1115g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1116g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1117g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1118g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1119g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d111g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1120g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1121g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1122g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1123g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1124g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1125g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1126g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1127g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1128g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1129g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d112g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1130g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1131g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1132g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1133g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1134g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1135g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1136g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1137g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1138g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1139g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d113g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1140g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1141g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1142g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1143g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1144g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1145g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1146g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1147g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1148g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1149g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d114g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1150g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1151g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1152g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1153g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1154g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1155g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1156g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1157g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1158g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1159g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d115g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1160g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1161g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1162g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1163g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1164g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1165g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1166g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1167g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1168g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1169g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d116g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1170g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1171g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1172g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1173g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1174g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1175g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1176g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1177g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1178g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1179g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d117g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1180g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1181g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1182g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1183g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1184g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1185g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1186g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1187g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1188g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1189g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d118g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1190g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1191g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1192g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1193g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1194g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1195g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1196g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1197g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1198g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1199g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d119g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d11g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1200g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1201g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1202g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1203g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1204g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1205g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1206g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1207g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1208g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1209g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d120g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1210g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1211g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1212g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1213g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1214g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1215g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1216g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1217g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1218g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1219g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d121g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1220g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1221g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1222g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1223g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1224g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1225g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1226g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1227g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1228g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1229g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d122g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1230g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1231g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1232g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1233g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1234g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1235g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1236g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1237g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1238g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1239g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d123g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1240g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1241g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1242g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1243g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1244g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1245g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1246g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1247g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1248g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1249g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d124g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1250g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1251g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1252g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1253g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1254g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1255g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1256g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1257g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1258g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1259g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d125g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1260g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1261g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1262g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1263g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1264g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1265g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1266g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1267g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1268g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1269g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d126g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1270g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1271g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1272g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1273g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1274g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1275g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1276g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1277g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1278g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1279g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d127g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1280g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1281g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1282g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1283g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1284g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1285g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1286g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1287g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1288g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1289g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d128g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1290g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1291g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1292g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1293g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1294g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1295g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1296g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1297g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1298g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1299g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d129g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d12g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1300g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1301g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1302g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1303g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1304g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1305g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1306g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1307g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1308g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1309g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d130g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1310g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1311g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1312g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1313g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1314g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1315g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1316g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1317g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1318g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1319g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d131g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1320g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1321g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1322g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1323g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1324g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1325g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1326g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1327g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1328g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1329g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d132g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1330g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1331g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1332g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1333g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1334g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1335g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1336g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1337g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1338g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1339g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d133g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1340g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1341g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1342g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1343g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1344g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1345g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1346g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1347g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1348g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1349g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d134g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1350g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1351g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1352g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1353g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1354g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1355g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1356g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1357g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1358g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1359g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d135g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1360g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1361g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1362g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1363g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1364g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1365g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1366g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1367g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1368g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1369g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d136g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1370g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1371g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1372g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1373g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1374g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1375g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1376g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1377g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1378g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1379g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d137g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1380g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1381g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1382g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1383g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1384g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1385g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1386g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1387g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1388g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1389g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d138g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1390g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1391g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1392g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1393g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1394g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1395g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1396g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1397g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1398g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1399g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d139g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d13g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1400g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1401g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1402g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1403g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1404g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1405g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1406g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1407g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1408g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1409g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d140g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1410g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1411g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1412g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1413g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1414g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1415g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1416g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1417g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1418g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1419g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d141g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1420g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1421g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1422g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1423g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1424g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1425g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1426g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1427g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1428g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1429g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d142g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1430g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1431g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1432g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1433g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1434g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1435g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1436g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1437g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1438g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1439g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d143g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1440g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1441g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1442g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1443g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1444g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1445g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1446g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1447g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1448g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1449g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d144g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1450g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1451g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1452g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1453g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1454g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1455g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1456g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1457g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1458g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1459g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d145g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1460g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1461g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1462g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1463g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1464g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1465g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1466g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1467g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1468g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1469g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d146g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1470g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1471g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1472g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1473g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1474g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1475g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1476g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1477g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1478g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1479g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d147g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1480g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1481g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1482g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1483g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1484g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1485g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1486g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1487g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1488g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1489g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d148g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1490g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1491g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1492g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1493g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1494g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1495g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1496g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1497g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1498g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1499g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d149g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d14g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1500g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1501g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1502g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1503g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1504g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1505g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1506g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1507g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1508g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1509g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d150g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1510g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1511g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1512g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1513g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1514g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1515g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1516g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1517g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1518g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1519g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d151g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1520g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1521g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1522g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1523g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1524g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1525g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1526g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1527g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1528g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1529g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d152g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1530g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1531g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1532g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1533g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1534g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1535g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1536g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1537g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1538g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1539g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d153g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1540g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1541g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1542g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1543g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1544g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1545g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1546g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1547g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1548g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1549g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d154g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1550g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1551g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1552g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1553g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1554g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1555g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1556g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1557g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1558g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1559g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d155g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1560g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1561g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1562g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1563g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1564g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1565g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1566g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1567g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1568g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1569g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d156g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1570g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1571g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1572g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1573g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1574g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1575g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1576g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1577g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1578g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1579g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d157g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1580g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1581g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1582g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1583g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1584g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1585g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1586g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1587g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1588g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1589g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d158g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1590g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1591g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1592g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1593g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1594g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1595g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1596g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1597g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1598g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1599g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d159g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d15g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1600g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1601g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1602g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1603g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1604g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1605g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1606g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1607g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1608g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1609g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d160g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1610g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1611g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1612g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1613g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1614g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1615g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1616g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1617g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1618g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1619g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d161g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1620g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1621g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1622g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1623g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1624g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1625g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1626g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1627g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1628g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1629g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d162g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1630g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1631g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1632g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1633g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1634g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1635g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1636g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1637g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1638g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1639g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d163g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1640g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1641g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1642g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1643g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1644g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1645g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1646g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1647g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1648g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1649g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d164g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1650g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1651g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1652g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1653g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1654g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1655g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1656g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1657g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1658g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1659g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d165g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1660g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1661g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1662g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1663g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1664g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1665g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1666g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1667g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1668g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1669g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d166g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1670g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1671g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1672g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1673g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1674g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1675g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1676g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1677g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1678g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1679g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d167g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1680g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1681g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1682g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1683g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1684g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1685g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1686g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1687g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1688g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1689g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d168g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1690g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1691g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1692g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1693g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1694g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1695g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1696g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1697g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1698g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1699g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d169g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d16g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1700g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1701g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1702g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1703g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1704g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1705g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1706g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1707g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1708g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1709g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d170g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1710g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1711g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1712g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1713g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1714g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1715g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1716g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1717g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1718g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1719g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d171g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1720g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1721g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1722g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1723g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1724g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1725g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1726g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1727g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial1_d1728g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d172g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d173g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d174g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d175g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d176g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d177g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d178g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d179g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d17g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d180g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d181g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d182g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d183g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d184g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d185g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d186g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d187g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d188g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d189g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d18g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d190g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d191g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d192g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d193g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d194g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d195g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d196g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d197g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d198g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d199g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d19g0v0Filler.json | 128 +++++++++++++++++++++
 .../sstore_combinations_initial1_d1g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d200g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d201g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d202g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d203g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d204g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d205g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d206g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d207g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d208g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d209g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d20g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d210g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d211g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d212g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d213g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d214g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d215g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d216g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d217g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d218g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d219g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d21g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d220g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d221g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d222g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d223g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d224g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d225g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d226g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d227g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d228g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d229g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d22g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d230g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d231g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d232g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d233g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d234g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d235g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d236g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d237g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d238g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d239g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d23g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d240g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d241g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d242g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d243g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d244g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d245g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d246g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d247g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d248g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d249g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d24g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d250g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d251g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d252g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d253g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d254g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d255g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d256g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d257g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d258g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d259g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d25g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d260g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d261g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d262g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d263g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d264g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d265g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d266g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d267g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d268g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d269g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d26g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d270g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d271g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d272g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d273g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d274g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d275g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d276g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d277g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d278g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d279g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d27g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d280g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d281g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d282g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d283g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d284g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d285g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d286g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d287g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d288g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d289g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d28g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d290g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d291g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d292g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d293g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d294g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d295g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d296g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d297g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d298g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d299g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d29g0v0Filler.json | 128 +++++++++++++++++++++
 .../sstore_combinations_initial1_d2g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d300g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d301g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d302g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d303g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d304g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d305g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d306g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d307g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d308g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d309g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d30g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d310g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d311g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d312g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d313g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d314g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d315g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d316g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d317g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d318g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d319g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d31g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d320g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d321g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d322g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d323g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d324g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d325g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d326g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d327g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d328g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d329g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d32g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d330g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d331g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d332g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d333g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d334g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d335g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d336g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d337g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d338g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d339g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d33g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d340g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d341g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d342g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d343g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d344g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d345g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d346g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d347g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d348g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d349g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d34g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d350g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d351g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d352g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d353g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d354g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d355g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d356g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d357g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d358g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d359g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d35g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d360g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d361g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d362g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d363g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d364g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d365g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d366g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d367g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d368g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d369g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d36g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d370g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d371g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d372g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d373g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d374g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d375g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d376g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d377g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d378g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d379g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d37g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d380g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d381g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d382g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d383g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d384g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d385g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d386g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d387g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d388g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d389g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d38g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d390g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d391g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d392g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d393g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d394g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d395g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d396g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d397g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d398g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d399g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d39g0v0Filler.json | 128 +++++++++++++++++++++
 .../sstore_combinations_initial1_d3g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d400g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d401g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d402g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d403g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d404g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d405g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d406g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d407g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d408g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d409g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d40g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d410g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d411g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d412g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d413g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d414g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d415g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d416g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d417g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d418g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d419g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d41g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d420g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d421g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d422g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d423g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d424g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d425g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d426g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d427g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d428g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d429g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d42g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d430g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d431g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d432g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d433g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d434g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d435g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d436g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d437g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d438g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d439g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d43g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d440g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d441g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d442g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d443g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d444g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d445g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d446g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d447g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d448g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d449g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d44g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d450g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d451g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d452g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d453g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d454g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d455g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d456g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d457g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d458g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d459g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d45g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d460g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d461g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d462g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d463g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d464g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d465g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d466g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d467g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d468g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d469g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d46g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d470g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d471g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d472g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d473g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d474g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d475g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d476g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d477g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d478g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d479g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d47g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d480g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d481g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d482g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d483g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d484g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d485g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d486g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d487g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d488g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d489g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d48g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d490g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d491g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d492g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d493g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d494g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d495g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d496g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d497g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d498g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d499g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d49g0v0Filler.json | 128 +++++++++++++++++++++
 .../sstore_combinations_initial1_d4g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d500g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d501g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d502g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d503g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d504g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d505g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d506g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d507g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d508g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d509g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d50g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d510g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d511g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d512g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d513g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d514g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d515g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d516g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d517g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d518g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d519g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d51g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d520g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d521g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d522g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d523g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d524g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d525g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d526g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d527g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d528g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d529g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d52g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d530g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d531g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d532g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d533g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d534g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d535g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d536g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d537g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d538g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d539g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d53g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d540g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d541g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d542g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d543g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d544g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d545g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d546g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d547g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d548g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d549g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d54g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d550g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d551g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d552g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d553g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d554g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d555g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d556g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d557g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d558g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d559g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d55g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d560g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d561g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d562g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d563g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d564g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d565g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d566g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d567g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d568g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d569g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d56g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d570g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d571g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d572g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d573g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d574g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d575g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d576g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d577g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d578g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d579g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d57g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d580g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d581g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d582g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d583g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d584g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d585g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d586g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d587g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d588g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d589g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d58g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d590g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d591g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d592g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d593g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d594g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d595g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d596g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d597g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d598g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d599g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d59g0v0Filler.json | 128 +++++++++++++++++++++
 .../sstore_combinations_initial1_d5g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d600g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d601g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d602g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d603g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d604g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d605g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d606g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d607g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d608g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d609g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d60g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d610g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d611g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d612g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d613g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d614g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d615g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d616g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d617g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d618g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d619g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d61g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d620g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d621g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d622g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d623g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d624g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d625g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d626g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d627g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d628g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d629g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d62g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d630g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d631g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d632g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d633g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d634g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d635g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d636g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d637g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d638g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d639g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d63g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d640g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d641g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d642g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d643g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d644g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d645g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d646g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d647g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d648g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d649g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d64g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d650g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d651g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d652g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d653g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d654g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d655g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d656g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d657g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d658g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d659g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d65g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d660g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d661g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d662g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d663g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d664g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d665g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d666g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d667g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d668g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d669g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d66g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d670g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d671g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d672g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d673g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d674g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d675g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d676g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d677g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d678g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d679g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d67g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d680g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d681g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d682g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d683g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d684g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d685g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d686g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d687g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d688g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d689g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d68g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d690g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d691g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d692g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d693g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d694g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d695g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d696g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d697g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d698g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d699g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d69g0v0Filler.json | 128 +++++++++++++++++++++
 .../sstore_combinations_initial1_d6g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d700g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d701g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d702g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d703g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d704g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d705g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d706g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d707g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d708g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d709g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d70g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d710g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d711g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d712g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d713g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d714g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d715g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d716g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d717g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d718g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d719g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d71g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d720g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d721g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d722g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d723g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d724g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d725g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d726g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d727g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d728g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d729g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d72g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d730g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d731g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d732g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d733g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d734g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d735g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d736g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d737g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d738g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d739g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d73g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d740g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d741g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d742g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d743g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d744g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d745g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d746g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d747g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d748g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d749g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d74g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d750g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d751g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d752g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d753g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d754g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d755g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d756g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d757g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d758g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d759g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d75g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d760g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d761g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d762g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d763g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d764g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d765g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d766g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d767g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d768g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d769g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d76g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d770g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d771g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d772g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d773g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d774g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d775g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d776g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d777g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d778g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d779g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d77g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d780g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d781g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d782g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d783g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d784g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d785g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d786g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d787g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d788g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d789g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d78g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d790g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d791g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d792g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d793g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d794g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d795g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d796g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d797g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d798g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d799g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d79g0v0Filler.json | 128 +++++++++++++++++++++
 .../sstore_combinations_initial1_d7g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d800g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d801g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d802g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d803g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d804g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d805g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d806g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d807g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d808g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d809g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d80g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d810g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d811g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d812g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d813g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d814g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d815g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d816g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d817g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d818g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d819g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d81g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d820g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d821g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d822g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d823g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d824g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d825g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d826g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d827g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d828g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d829g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d82g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d830g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d831g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d832g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d833g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d834g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d835g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d836g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d837g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d838g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d839g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d83g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d840g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d841g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d842g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d843g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d844g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d845g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d846g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d847g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d848g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d849g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d84g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d850g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d851g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d852g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d853g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d854g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d855g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d856g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d857g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d858g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d859g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d85g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d860g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d861g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d862g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d863g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d864g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d865g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d866g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d867g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d868g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d869g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d86g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d870g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d871g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d872g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d873g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d874g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d875g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d876g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d877g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d878g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d879g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d87g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d880g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d881g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d882g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d883g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d884g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d885g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d886g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d887g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d888g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d889g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d88g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d890g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d891g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d892g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d893g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d894g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d895g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d896g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d897g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d898g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d899g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d89g0v0Filler.json | 128 +++++++++++++++++++++
 .../sstore_combinations_initial1_d8g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d900g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d901g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d902g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d903g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d904g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d905g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d906g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d907g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d908g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d909g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d90g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d910g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d911g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d912g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d913g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d914g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d915g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d916g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d917g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d918g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d919g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d91g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d920g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d921g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d922g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d923g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d924g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d925g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d926g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d927g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d928g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d929g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d92g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d930g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d931g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d932g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d933g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d934g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d935g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d936g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d937g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d938g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d939g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d93g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d940g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d941g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d942g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d943g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d944g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d945g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d946g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d947g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d948g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d949g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d94g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d950g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d951g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d952g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d953g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d954g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d955g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d956g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d957g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d958g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d959g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d95g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d960g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d961g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d962g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d963g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d964g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d965g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d966g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d967g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d968g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d969g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d96g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d970g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d971g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d972g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d973g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d974g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d975g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d976g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d977g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d978g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d979g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d97g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d980g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d981g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d982g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d983g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d984g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d985g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d986g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d987g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d988g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d989g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d98g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d990g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d991g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d992g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d993g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d994g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d995g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d996g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d997g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d998g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial1_d999g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial1_d99g0v0Filler.json | 128 +++++++++++++++++++++
 .../sstore_combinations_initial1_d9g0v0Filler.json | 128 +++++++++++++++++++++
 .../sstore_combinations_initial2_d0g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1000g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1001g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1002g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1003g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1004g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1005g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1006g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1007g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1008g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1009g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d100g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1010g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1011g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1012g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1013g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1014g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1015g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1016g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1017g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1018g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1019g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d101g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1020g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1021g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1022g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1023g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1024g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1025g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1026g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1027g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1028g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1029g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d102g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1030g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1031g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1032g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1033g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1034g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1035g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1036g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1037g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1038g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1039g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d103g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1040g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1041g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1042g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1043g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1044g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1045g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1046g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1047g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1048g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1049g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d104g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1050g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1051g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1052g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1053g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1054g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1055g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1056g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1057g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1058g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1059g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d105g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1060g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1061g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1062g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1063g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1064g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1065g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1066g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1067g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1068g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1069g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d106g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1070g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1071g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1072g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1073g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1074g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1075g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1076g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1077g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1078g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1079g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d107g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1080g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1081g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1082g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1083g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1084g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1085g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1086g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1087g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1088g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1089g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d108g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1090g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1091g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1092g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1093g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1094g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1095g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1096g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1097g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1098g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1099g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d109g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d10g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1100g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1101g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1102g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1103g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1104g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1105g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1106g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1107g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1108g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1109g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d110g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1110g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1111g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1112g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1113g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1114g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1115g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1116g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1117g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1118g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1119g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d111g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1120g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1121g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1122g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1123g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1124g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1125g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1126g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1127g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1128g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1129g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d112g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1130g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1131g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1132g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1133g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1134g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1135g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1136g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1137g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1138g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1139g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d113g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1140g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1141g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1142g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1143g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1144g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1145g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1146g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1147g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1148g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1149g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d114g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1150g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1151g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1152g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1153g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1154g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1155g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1156g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1157g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1158g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1159g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d115g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1160g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1161g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1162g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1163g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1164g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1165g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1166g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1167g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1168g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1169g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d116g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1170g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1171g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1172g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1173g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1174g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1175g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1176g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1177g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1178g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1179g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d117g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1180g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1181g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1182g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1183g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1184g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1185g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1186g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1187g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1188g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1189g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d118g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1190g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1191g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1192g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1193g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1194g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1195g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1196g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1197g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1198g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1199g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d119g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d11g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1200g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1201g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1202g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1203g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1204g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1205g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1206g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1207g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1208g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1209g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d120g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1210g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1211g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1212g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1213g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1214g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1215g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1216g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1217g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1218g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1219g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d121g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1220g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1221g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1222g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1223g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1224g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1225g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1226g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1227g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1228g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1229g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d122g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1230g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1231g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1232g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1233g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1234g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1235g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1236g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1237g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1238g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1239g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d123g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1240g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1241g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1242g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1243g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1244g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1245g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1246g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1247g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1248g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1249g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d124g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1250g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1251g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1252g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1253g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1254g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1255g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1256g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1257g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1258g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1259g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d125g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1260g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1261g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1262g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1263g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1264g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1265g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1266g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1267g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1268g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1269g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d126g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1270g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1271g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1272g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1273g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1274g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1275g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1276g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1277g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1278g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1279g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d127g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1280g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1281g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1282g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1283g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1284g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1285g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1286g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1287g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1288g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1289g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d128g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1290g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1291g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1292g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1293g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1294g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1295g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1296g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1297g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1298g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1299g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d129g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d12g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1300g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1301g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1302g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1303g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1304g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1305g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1306g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1307g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1308g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1309g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d130g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1310g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1311g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1312g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1313g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1314g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1315g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1316g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1317g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1318g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1319g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d131g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1320g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1321g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1322g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1323g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1324g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1325g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1326g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1327g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1328g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1329g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d132g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1330g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1331g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1332g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1333g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1334g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1335g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1336g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1337g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1338g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1339g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d133g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1340g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1341g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1342g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1343g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1344g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1345g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1346g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1347g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1348g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1349g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d134g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1350g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1351g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1352g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1353g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1354g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1355g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1356g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1357g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1358g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1359g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d135g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1360g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1361g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1362g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1363g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1364g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1365g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1366g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1367g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1368g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1369g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d136g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1370g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1371g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1372g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1373g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1374g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1375g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1376g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1377g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1378g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1379g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d137g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1380g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1381g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1382g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1383g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1384g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1385g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1386g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1387g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1388g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1389g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d138g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1390g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1391g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1392g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1393g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1394g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1395g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1396g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1397g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1398g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1399g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d139g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d13g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1400g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1401g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1402g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1403g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1404g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1405g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1406g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1407g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1408g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1409g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d140g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1410g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1411g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1412g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1413g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1414g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1415g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1416g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1417g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1418g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1419g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d141g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1420g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1421g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1422g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1423g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1424g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1425g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1426g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1427g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1428g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1429g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d142g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1430g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1431g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1432g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1433g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1434g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1435g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1436g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1437g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1438g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1439g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d143g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1440g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1441g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1442g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1443g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1444g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1445g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1446g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1447g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1448g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1449g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d144g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1450g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1451g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1452g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1453g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1454g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1455g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1456g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1457g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1458g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1459g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d145g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1460g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1461g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1462g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1463g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1464g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1465g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1466g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1467g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1468g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1469g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d146g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1470g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1471g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1472g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1473g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1474g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1475g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1476g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1477g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1478g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1479g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d147g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1480g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1481g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1482g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1483g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1484g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1485g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1486g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1487g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1488g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1489g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d148g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1490g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1491g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1492g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1493g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1494g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1495g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1496g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1497g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1498g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1499g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d149g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d14g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1500g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1501g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1502g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1503g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1504g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1505g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1506g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1507g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1508g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1509g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d150g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1510g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1511g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1512g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1513g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1514g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1515g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1516g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1517g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1518g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1519g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d151g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1520g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1521g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1522g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1523g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1524g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1525g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1526g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1527g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1528g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1529g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d152g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1530g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1531g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1532g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1533g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1534g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1535g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1536g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1537g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1538g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1539g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d153g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1540g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1541g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1542g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1543g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1544g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1545g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1546g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1547g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1548g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1549g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d154g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1550g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1551g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1552g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1553g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1554g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1555g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1556g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1557g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1558g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1559g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d155g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1560g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1561g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1562g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1563g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1564g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1565g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1566g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1567g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1568g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1569g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d156g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1570g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1571g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1572g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1573g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1574g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1575g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1576g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1577g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1578g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1579g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d157g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1580g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1581g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1582g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1583g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1584g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1585g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1586g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1587g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1588g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1589g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d158g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1590g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1591g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1592g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1593g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1594g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1595g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1596g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1597g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1598g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1599g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d159g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d15g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1600g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1601g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1602g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1603g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1604g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1605g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1606g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1607g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1608g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1609g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d160g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1610g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1611g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1612g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1613g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1614g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1615g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1616g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1617g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1618g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1619g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d161g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1620g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1621g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1622g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1623g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1624g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1625g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1626g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1627g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1628g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1629g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d162g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1630g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1631g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1632g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1633g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1634g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1635g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1636g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1637g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1638g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1639g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d163g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1640g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1641g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1642g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1643g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1644g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1645g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1646g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1647g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1648g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1649g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d164g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1650g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1651g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1652g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1653g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1654g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1655g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1656g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1657g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1658g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1659g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d165g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1660g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1661g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1662g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1663g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1664g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1665g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1666g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1667g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1668g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1669g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d166g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1670g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1671g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1672g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1673g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1674g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1675g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1676g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1677g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1678g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1679g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d167g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1680g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1681g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1682g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1683g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1684g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1685g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1686g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1687g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1688g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1689g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d168g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1690g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1691g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1692g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1693g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1694g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1695g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1696g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1697g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1698g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1699g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d169g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d16g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1700g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1701g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1702g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1703g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1704g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1705g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1706g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1707g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1708g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1709g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d170g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1710g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1711g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1712g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1713g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1714g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1715g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1716g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1717g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1718g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1719g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d171g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1720g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1721g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1722g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1723g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1724g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1725g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1726g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1727g0v0Filler.json | 128 +++++++++++++++++++++
 ...tore_combinations_initial2_d1728g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d172g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d173g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d174g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d175g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d176g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d177g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d178g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d179g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d17g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d180g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d181g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d182g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d183g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d184g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d185g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d186g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d187g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d188g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d189g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d18g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d190g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d191g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d192g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d193g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d194g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d195g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d196g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d197g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d198g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d199g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d19g0v0Filler.json | 128 +++++++++++++++++++++
 .../sstore_combinations_initial2_d1g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d200g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d201g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d202g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d203g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d204g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d205g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d206g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d207g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d208g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d209g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d20g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d210g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d211g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d212g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d213g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d214g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d215g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d216g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d217g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d218g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d219g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d21g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d220g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d221g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d222g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d223g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d224g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d225g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d226g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d227g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d228g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d229g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d22g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d230g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d231g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d232g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d233g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d234g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d235g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d236g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d237g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d238g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d239g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d23g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d240g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d241g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d242g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d243g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d244g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d245g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d246g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d247g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d248g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d249g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d24g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d250g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d251g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d252g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d253g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d254g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d255g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d256g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d257g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d258g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d259g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d25g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d260g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d261g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d262g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d263g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d264g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d265g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d266g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d267g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d268g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d269g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d26g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d270g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d271g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d272g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d273g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d274g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d275g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d276g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d277g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d278g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d279g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d27g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d280g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d281g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d282g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d283g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d284g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d285g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d286g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d287g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d288g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d289g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d28g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d290g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d291g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d292g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d293g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d294g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d295g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d296g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d297g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d298g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d299g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d29g0v0Filler.json | 128 +++++++++++++++++++++
 .../sstore_combinations_initial2_d2g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d300g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d301g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d302g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d303g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d304g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d305g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d306g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d307g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d308g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d309g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d30g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d310g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d311g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d312g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d313g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d314g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d315g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d316g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d317g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d318g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d319g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d31g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d320g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d321g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d322g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d323g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d324g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d325g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d326g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d327g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d328g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d329g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d32g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d330g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d331g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d332g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d333g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d334g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d335g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d336g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d337g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d338g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d339g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d33g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d340g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d341g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d342g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d343g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d344g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d345g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d346g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d347g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d348g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d349g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d34g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d350g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d351g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d352g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d353g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d354g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d355g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d356g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d357g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d358g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d359g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d35g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d360g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d361g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d362g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d363g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d364g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d365g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d366g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d367g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d368g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d369g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d36g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d370g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d371g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d372g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d373g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d374g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d375g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d376g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d377g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d378g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d379g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d37g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d380g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d381g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d382g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d383g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d384g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d385g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d386g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d387g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d388g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d389g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d38g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d390g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d391g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d392g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d393g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d394g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d395g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d396g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d397g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d398g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d399g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d39g0v0Filler.json | 128 +++++++++++++++++++++
 .../sstore_combinations_initial2_d3g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d400g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d401g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d402g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d403g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d404g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d405g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d406g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d407g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d408g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d409g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d40g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d410g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d411g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d412g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d413g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d414g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d415g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d416g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d417g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d418g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d419g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d41g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d420g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d421g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d422g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d423g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d424g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d425g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d426g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d427g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d428g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d429g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d42g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d430g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d431g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d432g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d433g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d434g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d435g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d436g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d437g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d438g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d439g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d43g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d440g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d441g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d442g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d443g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d444g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d445g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d446g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d447g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d448g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d449g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d44g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d450g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d451g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d452g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d453g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d454g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d455g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d456g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d457g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d458g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d459g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d45g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d460g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d461g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d462g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d463g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d464g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d465g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d466g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d467g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d468g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d469g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d46g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d470g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d471g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d472g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d473g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d474g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d475g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d476g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d477g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d478g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d479g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d47g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d480g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d481g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d482g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d483g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d484g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d485g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d486g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d487g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d488g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d489g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d48g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d490g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d491g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d492g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d493g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d494g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d495g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d496g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d497g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d498g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d499g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d49g0v0Filler.json | 128 +++++++++++++++++++++
 .../sstore_combinations_initial2_d4g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d500g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d501g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d502g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d503g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d504g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d505g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d506g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d507g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d508g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d509g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d50g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d510g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d511g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d512g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d513g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d514g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d515g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d516g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d517g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d518g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d519g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d51g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d520g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d521g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d522g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d523g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d524g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d525g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d526g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d527g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d528g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d529g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d52g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d530g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d531g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d532g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d533g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d534g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d535g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d536g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d537g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d538g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d539g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d53g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d540g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d541g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d542g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d543g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d544g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d545g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d546g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d547g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d548g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d549g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d54g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d550g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d551g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d552g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d553g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d554g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d555g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d556g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d557g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d558g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d559g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d55g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d560g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d561g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d562g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d563g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d564g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d565g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d566g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d567g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d568g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d569g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d56g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d570g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d571g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d572g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d573g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d574g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d575g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d576g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d577g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d578g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d579g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d57g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d580g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d581g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d582g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d583g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d584g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d585g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d586g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d587g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d588g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d589g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d58g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d590g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d591g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d592g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d593g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d594g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d595g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d596g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d597g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d598g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d599g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d59g0v0Filler.json | 128 +++++++++++++++++++++
 .../sstore_combinations_initial2_d5g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d600g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d601g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d602g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d603g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d604g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d605g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d606g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d607g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d608g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d609g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d60g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d610g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d611g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d612g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d613g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d614g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d615g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d616g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d617g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d618g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d619g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d61g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d620g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d621g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d622g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d623g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d624g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d625g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d626g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d627g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d628g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d629g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d62g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d630g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d631g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d632g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d633g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d634g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d635g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d636g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d637g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d638g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d639g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d63g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d640g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d641g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d642g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d643g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d644g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d645g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d646g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d647g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d648g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d649g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d64g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d650g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d651g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d652g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d653g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d654g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d655g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d656g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d657g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d658g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d659g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d65g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d660g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d661g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d662g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d663g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d664g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d665g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d666g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d667g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d668g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d669g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d66g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d670g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d671g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d672g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d673g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d674g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d675g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d676g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d677g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d678g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d679g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d67g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d680g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d681g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d682g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d683g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d684g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d685g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d686g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d687g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d688g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d689g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d68g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d690g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d691g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d692g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d693g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d694g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d695g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d696g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d697g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d698g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d699g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d69g0v0Filler.json | 128 +++++++++++++++++++++
 .../sstore_combinations_initial2_d6g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d700g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d701g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d702g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d703g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d704g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d705g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d706g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d707g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d708g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d709g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d70g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d710g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d711g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d712g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d713g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d714g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d715g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d716g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d717g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d718g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d719g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d71g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d720g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d721g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d722g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d723g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d724g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d725g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d726g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d727g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d728g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d729g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d72g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d730g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d731g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d732g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d733g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d734g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d735g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d736g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d737g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d738g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d739g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d73g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d740g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d741g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d742g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d743g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d744g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d745g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d746g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d747g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d748g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d749g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d74g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d750g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d751g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d752g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d753g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d754g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d755g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d756g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d757g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d758g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d759g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d75g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d760g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d761g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d762g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d763g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d764g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d765g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d766g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d767g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d768g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d769g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d76g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d770g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d771g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d772g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d773g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d774g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d775g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d776g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d777g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d778g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d779g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d77g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d780g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d781g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d782g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d783g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d784g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d785g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d786g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d787g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d788g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d789g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d78g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d790g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d791g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d792g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d793g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d794g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d795g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d796g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d797g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d798g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d799g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d79g0v0Filler.json | 128 +++++++++++++++++++++
 .../sstore_combinations_initial2_d7g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d800g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d801g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d802g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d803g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d804g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d805g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d806g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d807g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d808g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d809g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d80g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d810g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d811g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d812g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d813g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d814g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d815g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d816g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d817g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d818g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d819g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d81g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d820g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d821g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d822g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d823g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d824g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d825g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d826g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d827g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d828g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d829g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d82g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d830g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d831g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d832g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d833g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d834g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d835g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d836g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d837g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d838g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d839g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d83g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d840g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d841g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d842g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d843g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d844g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d845g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d846g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d847g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d848g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d849g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d84g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d850g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d851g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d852g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d853g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d854g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d855g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d856g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d857g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d858g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d859g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d85g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d860g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d861g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d862g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d863g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d864g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d865g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d866g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d867g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d868g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d869g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d86g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d870g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d871g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d872g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d873g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d874g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d875g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d876g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d877g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d878g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d879g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d87g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d880g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d881g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d882g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d883g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d884g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d885g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d886g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d887g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d888g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d889g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d88g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d890g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d891g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d892g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d893g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d894g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d895g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d896g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d897g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d898g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d899g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d89g0v0Filler.json | 128 +++++++++++++++++++++
 .../sstore_combinations_initial2_d8g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d900g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d901g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d902g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d903g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d904g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d905g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d906g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d907g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d908g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d909g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d90g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d910g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d911g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d912g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d913g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d914g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d915g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d916g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d917g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d918g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d919g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d91g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d920g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d921g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d922g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d923g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d924g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d925g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d926g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d927g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d928g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d929g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d92g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d930g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d931g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d932g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d933g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d934g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d935g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d936g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d937g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d938g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d939g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d93g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d940g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d941g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d942g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d943g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d944g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d945g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d946g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d947g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d948g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d949g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d94g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d950g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d951g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d952g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d953g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d954g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d955g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d956g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d957g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d958g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d959g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d95g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d960g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d961g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d962g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d963g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d964g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d965g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d966g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d967g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d968g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d969g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d96g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d970g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d971g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d972g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d973g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d974g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d975g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d976g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d977g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d978g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d979g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d97g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d980g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d981g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d982g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d983g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d984g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d985g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d986g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d987g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d988g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d989g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d98g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d990g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d991g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d992g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d993g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d994g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d995g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d996g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d997g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d998g0v0Filler.json | 128 +++++++++++++++++++++
 ...store_combinations_initial2_d999g0v0Filler.json | 128 +++++++++++++++++++++
 ...sstore_combinations_initial2_d99g0v0Filler.json | 128 +++++++++++++++++++++
 .../sstore_combinations_initial2_d9g0v0Filler.json | 128 +++++++++++++++++++++
 5187 files changed, 663936 insertions(+)
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d0g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1000g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1001g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1002g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1003g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1004g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1005g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1006g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1007g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1008g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1009g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d100g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1010g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1011g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1012g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1013g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1014g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1015g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1016g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1017g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1018g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1019g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d101g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1020g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1021g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1022g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1023g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1024g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1025g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1026g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1027g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1028g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1029g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d102g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1030g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1031g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1032g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1033g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1034g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1035g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1036g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1037g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1038g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1039g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d103g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1040g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1041g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1042g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1043g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1044g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1045g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1046g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1047g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1048g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1049g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d104g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1050g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1051g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1052g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1053g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1054g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1055g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1056g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1057g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1058g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1059g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d105g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1060g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1061g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1062g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1063g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1064g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1065g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1066g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1067g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1068g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1069g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d106g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1070g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1071g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1072g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1073g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1074g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1075g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1076g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1077g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1078g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1079g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d107g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1080g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1081g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1082g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1083g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1084g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1085g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1086g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1087g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1088g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1089g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d108g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1090g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1091g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1092g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1093g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1094g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1095g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1096g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1097g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1098g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1099g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d109g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d10g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1100g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1101g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1102g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1103g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1104g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1105g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1106g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1107g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1108g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1109g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d110g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1110g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1111g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1112g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1113g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1114g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1115g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1116g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1117g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1118g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1119g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d111g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1120g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1121g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1122g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1123g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1124g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1125g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1126g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1127g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1128g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1129g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d112g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1130g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1131g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1132g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1133g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1134g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1135g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1136g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1137g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1138g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1139g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d113g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1140g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1141g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1142g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1143g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1144g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1145g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1146g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1147g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1148g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1149g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d114g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1150g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1151g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1152g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1153g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1154g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1155g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1156g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1157g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1158g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1159g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d115g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1160g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1161g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1162g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1163g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1164g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1165g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1166g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1167g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1168g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1169g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d116g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1170g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1171g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1172g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1173g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1174g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1175g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1176g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1177g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1178g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1179g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d117g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1180g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1181g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1182g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1183g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1184g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1185g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1186g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1187g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1188g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1189g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d118g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1190g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1191g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1192g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1193g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1194g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1195g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1196g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1197g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1198g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1199g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d119g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d11g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1200g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1201g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1202g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1203g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1204g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1205g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1206g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1207g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1208g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1209g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d120g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1210g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1211g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1212g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1213g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1214g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1215g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1216g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1217g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1218g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1219g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d121g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1220g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1221g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1222g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1223g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1224g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1225g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1226g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1227g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1228g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1229g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d122g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1230g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1231g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1232g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1233g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1234g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1235g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1236g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1237g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1238g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1239g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d123g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1240g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1241g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1242g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1243g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1244g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1245g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1246g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1247g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1248g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1249g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d124g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1250g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1251g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1252g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1253g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1254g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1255g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1256g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1257g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1258g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1259g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d125g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1260g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1261g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1262g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1263g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1264g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1265g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1266g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1267g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1268g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1269g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d126g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1270g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1271g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1272g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1273g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1274g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1275g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1276g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1277g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1278g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1279g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d127g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1280g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1281g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1282g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1283g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1284g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1285g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1286g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1287g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1288g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1289g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d128g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1290g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1291g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1292g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1293g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1294g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1295g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1296g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1297g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1298g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1299g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d129g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d12g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1300g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1301g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1302g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1303g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1304g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1305g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1306g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1307g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1308g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1309g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d130g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1310g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1311g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1312g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1313g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1314g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1315g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1316g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1317g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1318g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1319g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d131g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1320g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1321g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1322g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1323g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1324g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1325g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1326g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1327g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1328g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1329g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d132g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1330g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1331g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1332g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1333g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1334g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1335g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1336g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1337g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1338g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1339g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d133g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1340g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1341g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1342g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1343g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1344g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1345g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1346g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1347g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1348g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1349g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d134g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1350g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1351g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1352g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1353g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1354g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1355g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1356g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1357g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1358g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1359g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d135g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1360g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1361g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1362g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1363g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1364g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1365g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1366g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1367g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1368g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1369g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d136g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1370g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1371g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1372g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1373g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1374g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1375g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1376g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1377g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1378g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1379g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d137g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1380g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1381g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1382g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1383g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1384g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1385g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1386g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1387g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1388g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1389g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d138g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1390g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1391g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1392g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1393g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1394g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1395g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1396g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1397g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1398g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1399g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d139g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d13g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1400g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1401g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1402g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1403g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1404g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1405g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1406g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1407g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1408g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1409g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d140g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1410g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1411g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1412g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1413g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1414g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1415g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1416g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1417g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1418g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1419g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d141g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1420g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1421g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1422g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1423g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1424g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1425g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1426g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1427g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1428g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1429g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d142g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1430g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1431g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1432g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1433g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1434g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1435g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1436g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1437g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1438g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1439g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d143g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1440g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1441g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1442g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1443g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1444g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1445g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1446g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1447g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1448g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1449g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d144g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1450g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1451g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1452g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1453g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1454g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1455g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1456g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1457g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1458g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1459g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d145g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1460g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1461g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1462g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1463g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1464g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1465g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1466g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1467g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1468g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1469g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d146g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1470g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1471g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1472g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1473g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1474g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1475g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1476g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1477g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1478g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1479g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d147g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1480g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1481g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1482g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1483g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1484g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1485g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1486g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1487g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1488g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1489g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d148g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1490g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1491g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1492g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1493g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1494g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1495g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1496g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1497g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1498g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1499g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d149g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d14g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1500g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1501g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1502g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1503g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1504g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1505g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1506g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1507g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1508g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1509g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d150g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1510g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1511g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1512g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1513g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1514g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1515g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1516g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1517g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1518g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1519g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d151g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1520g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1521g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1522g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1523g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1524g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1525g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1526g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1527g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1528g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1529g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d152g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1530g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1531g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1532g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1533g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1534g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1535g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1536g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1537g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1538g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1539g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d153g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1540g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1541g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1542g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1543g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1544g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1545g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1546g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1547g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1548g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1549g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d154g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1550g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1551g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1552g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1553g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1554g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1555g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1556g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1557g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1558g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1559g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d155g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1560g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1561g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1562g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1563g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1564g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1565g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1566g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1567g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1568g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1569g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d156g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1570g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1571g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1572g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1573g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1574g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1575g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1576g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1577g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1578g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1579g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d157g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1580g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1581g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1582g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1583g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1584g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1585g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1586g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1587g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1588g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1589g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d158g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1590g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1591g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1592g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1593g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1594g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1595g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1596g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1597g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1598g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1599g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d159g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d15g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1600g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1601g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1602g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1603g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1604g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1605g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1606g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1607g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1608g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1609g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d160g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1610g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1611g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1612g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1613g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1614g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1615g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1616g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1617g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1618g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1619g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d161g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1620g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1621g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1622g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1623g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1624g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1625g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1626g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1627g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1628g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1629g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d162g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1630g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1631g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1632g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1633g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1634g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1635g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1636g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1637g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1638g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1639g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d163g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1640g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1641g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1642g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1643g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1644g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1645g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1646g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1647g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1648g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1649g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d164g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1650g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1651g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1652g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1653g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1654g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1655g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1656g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1657g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1658g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1659g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d165g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1660g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1661g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1662g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1663g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1664g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1665g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1666g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1667g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1668g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1669g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d166g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1670g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1671g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1672g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1673g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1674g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1675g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1676g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1677g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1678g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1679g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d167g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1680g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1681g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1682g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1683g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1684g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1685g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1686g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1687g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1688g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1689g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d168g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1690g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1691g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1692g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1693g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1694g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1695g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1696g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1697g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1698g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1699g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d169g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d16g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1700g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1701g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1702g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1703g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1704g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1705g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1706g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1707g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1708g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1709g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d170g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1710g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1711g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1712g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1713g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1714g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1715g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1716g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1717g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1718g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1719g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d171g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1720g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1721g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1722g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1723g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1724g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1725g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1726g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1727g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1728g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d172g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d173g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d174g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d175g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d176g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d177g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d178g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d179g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d17g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d180g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d181g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d182g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d183g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d184g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d185g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d186g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d187g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d188g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d189g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d18g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d190g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d191g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d192g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d193g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d194g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d195g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d196g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d197g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d198g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d199g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d19g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d200g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d201g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d202g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d203g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d204g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d205g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d206g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d207g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d208g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d209g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d20g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d210g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d211g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d212g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d213g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d214g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d215g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d216g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d217g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d218g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d219g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d21g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d220g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d221g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d222g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d223g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d224g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d225g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d226g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d227g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d228g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d229g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d22g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d230g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d231g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d232g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d233g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d234g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d235g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d236g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d237g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d238g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d239g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d23g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d240g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d241g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d242g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d243g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d244g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d245g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d246g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d247g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d248g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d249g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d24g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d250g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d251g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d252g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d253g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d254g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d255g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d256g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d257g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d258g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d259g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d25g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d260g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d261g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d262g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d263g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d264g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d265g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d266g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d267g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d268g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d269g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d26g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d270g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d271g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d272g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d273g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d274g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d275g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d276g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d277g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d278g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d279g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d27g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d280g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d281g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d282g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d283g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d284g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d285g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d286g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d287g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d288g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d289g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d28g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d290g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d291g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d292g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d293g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d294g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d295g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d296g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d297g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d298g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d299g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d29g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d2g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d300g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d301g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d302g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d303g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d304g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d305g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d306g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d307g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d308g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d309g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d30g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d310g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d311g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d312g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d313g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d314g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d315g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d316g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d317g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d318g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d319g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d31g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d320g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d321g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d322g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d323g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d324g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d325g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d326g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d327g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d328g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d329g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d32g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d330g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d331g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d332g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d333g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d334g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d335g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d336g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d337g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d338g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d339g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d33g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d340g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d341g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d342g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d343g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d344g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d345g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d346g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d347g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d348g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d349g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d34g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d350g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d351g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d352g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d353g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d354g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d355g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d356g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d357g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d358g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d359g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d35g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d360g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d361g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d362g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d363g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d364g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d365g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d366g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d367g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d368g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d369g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d36g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d370g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d371g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d372g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d373g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d374g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d375g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d376g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d377g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d378g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d379g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d37g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d380g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d381g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d382g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d383g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d384g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d385g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d386g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d387g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d388g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d389g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d38g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d390g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d391g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d392g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d393g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d394g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d395g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d396g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d397g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d398g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d399g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d39g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d3g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d400g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d401g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d402g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d403g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d404g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d405g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d406g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d407g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d408g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d409g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d40g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d410g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d411g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d412g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d413g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d414g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d415g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d416g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d417g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d418g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d419g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d41g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d420g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d421g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d422g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d423g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d424g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d425g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d426g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d427g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d428g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d429g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d42g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d430g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d431g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d432g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d433g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d434g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d435g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d436g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d437g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d438g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d439g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d43g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d440g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d441g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d442g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d443g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d444g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d445g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d446g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d447g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d448g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d449g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d44g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d450g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d451g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d452g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d453g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d454g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d455g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d456g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d457g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d458g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d459g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d45g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d460g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d461g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d462g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d463g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d464g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d465g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d466g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d467g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d468g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d469g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d46g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d470g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d471g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d472g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d473g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d474g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d475g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d476g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d477g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d478g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d479g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d47g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d480g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d481g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d482g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d483g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d484g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d485g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d486g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d487g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d488g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d489g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d48g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d490g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d491g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d492g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d493g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d494g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d495g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d496g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d497g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d498g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d499g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d49g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d4g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d500g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d501g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d502g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d503g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d504g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d505g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d506g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d507g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d508g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d509g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d50g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d510g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d511g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d512g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d513g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d514g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d515g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d516g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d517g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d518g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d519g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d51g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d520g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d521g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d522g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d523g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d524g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d525g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d526g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d527g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d528g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d529g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d52g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d530g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d531g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d532g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d533g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d534g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d535g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d536g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d537g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d538g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d539g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d53g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d540g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d541g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d542g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d543g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d544g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d545g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d546g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d547g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d548g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d549g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d54g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d550g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d551g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d552g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d553g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d554g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d555g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d556g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d557g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d558g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d559g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d55g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d560g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d561g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d562g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d563g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d564g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d565g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d566g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d567g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d568g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d569g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d56g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d570g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d571g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d572g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d573g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d574g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d575g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d576g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d577g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d578g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d579g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d57g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d580g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d581g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d582g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d583g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d584g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d585g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d586g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d587g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d588g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d589g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d58g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d590g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d591g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d592g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d593g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d594g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d595g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d596g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d597g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d598g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d599g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d59g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d5g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d600g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d601g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d602g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d603g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d604g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d605g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d606g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d607g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d608g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d609g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d60g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d610g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d611g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d612g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d613g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d614g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d615g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d616g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d617g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d618g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d619g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d61g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d620g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d621g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d622g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d623g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d624g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d625g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d626g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d627g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d628g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d629g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d62g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d630g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d631g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d632g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d633g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d634g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d635g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d636g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d637g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d638g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d639g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d63g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d640g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d641g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d642g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d643g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d644g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d645g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d646g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d647g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d648g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d649g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d64g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d650g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d651g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d652g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d653g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d654g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d655g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d656g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d657g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d658g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d659g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d65g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d660g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d661g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d662g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d663g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d664g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d665g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d666g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d667g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d668g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d669g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d66g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d670g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d671g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d672g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d673g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d674g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d675g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d676g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d677g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d678g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d679g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d67g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d680g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d681g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d682g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d683g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d684g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d685g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d686g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d687g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d688g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d689g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d68g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d690g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d691g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d692g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d693g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d694g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d695g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d696g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d697g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d698g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d699g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d69g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d6g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d700g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d701g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d702g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d703g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d704g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d705g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d706g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d707g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d708g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d709g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d70g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d710g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d711g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d712g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d713g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d714g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d715g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d716g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d717g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d718g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d719g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d71g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d720g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d721g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d722g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d723g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d724g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d725g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d726g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d727g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d728g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d729g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d72g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d730g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d731g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d732g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d733g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d734g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d735g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d736g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d737g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d738g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d739g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d73g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d740g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d741g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d742g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d743g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d744g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d745g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d746g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d747g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d748g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d749g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d74g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d750g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d751g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d752g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d753g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d754g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d755g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d756g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d757g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d758g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d759g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d75g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d760g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d761g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d762g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d763g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d764g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d765g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d766g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d767g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d768g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d769g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d76g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d770g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d771g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d772g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d773g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d774g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d775g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d776g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d777g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d778g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d779g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d77g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d780g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d781g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d782g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d783g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d784g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d785g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d786g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d787g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d788g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d789g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d78g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d790g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d791g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d792g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d793g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d794g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d795g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d796g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d797g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d798g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d799g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d79g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d7g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d800g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d801g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d802g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d803g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d804g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d805g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d806g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d807g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d808g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d809g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d80g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d810g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d811g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d812g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d813g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d814g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d815g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d816g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d817g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d818g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d819g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d81g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d820g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d821g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d822g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d823g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d824g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d825g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d826g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d827g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d828g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d829g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d82g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d830g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d831g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d832g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d833g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d834g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d835g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d836g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d837g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d838g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d839g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d83g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d840g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d841g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d842g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d843g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d844g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d845g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d846g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d847g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d848g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d849g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d84g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d850g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d851g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d852g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d853g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d854g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d855g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d856g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d857g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d858g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d859g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d85g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d860g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d861g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d862g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d863g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d864g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d865g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d866g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d867g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d868g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d869g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d86g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d870g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d871g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d872g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d873g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d874g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d875g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d876g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d877g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d878g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d879g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d87g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d880g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d881g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d882g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d883g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d884g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d885g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d886g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d887g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d888g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d889g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d88g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d890g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d891g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d892g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d893g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d894g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d895g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d896g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d897g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d898g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d899g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d89g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d8g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d900g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d901g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d902g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d903g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d904g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d905g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d906g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d907g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d908g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d909g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d90g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d910g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d911g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d912g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d913g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d914g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d915g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d916g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d917g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d918g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d919g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d91g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d920g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d921g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d922g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d923g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d924g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d925g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d926g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d927g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d928g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d929g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d92g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d930g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d931g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d932g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d933g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d934g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d935g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d936g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d937g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d938g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d939g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d93g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d940g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d941g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d942g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d943g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d944g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d945g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d946g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d947g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d948g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d949g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d94g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d950g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d951g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d952g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d953g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d954g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d955g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d956g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d957g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d958g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d959g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d95g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d960g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d961g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d962g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d963g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d964g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d965g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d966g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d967g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d968g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d969g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d96g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d970g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d971g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d972g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d973g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d974g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d975g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d976g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d977g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d978g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d979g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d97g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d980g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d981g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d982g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d983g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d984g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d985g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d986g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d987g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d988g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d989g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d98g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d990g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d991g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d992g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d993g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d994g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d995g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d996g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d997g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d998g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d999g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d99g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d9g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d0g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1000g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1001g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1002g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1003g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1004g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1005g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1006g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1007g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1008g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1009g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d100g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1010g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1011g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1012g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1013g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1014g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1015g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1016g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1017g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1018g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1019g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d101g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1020g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1021g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1022g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1023g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1024g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1025g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1026g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1027g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1028g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1029g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d102g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1030g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1031g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1032g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1033g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1034g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1035g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1036g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1037g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1038g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1039g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d103g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1040g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1041g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1042g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1043g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1044g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1045g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1046g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1047g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1048g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1049g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d104g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1050g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1051g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1052g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1053g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1054g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1055g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1056g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1057g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1058g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1059g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d105g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1060g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1061g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1062g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1063g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1064g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1065g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1066g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1067g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1068g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1069g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d106g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1070g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1071g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1072g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1073g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1074g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1075g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1076g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1077g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1078g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1079g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d107g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1080g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1081g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1082g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1083g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1084g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1085g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1086g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1087g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1088g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1089g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d108g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1090g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1091g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1092g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1093g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1094g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1095g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1096g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1097g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1098g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1099g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d109g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d10g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1100g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1101g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1102g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1103g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1104g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1105g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1106g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1107g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1108g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1109g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d110g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1110g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1111g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1112g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1113g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1114g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1115g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1116g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1117g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1118g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1119g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d111g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1120g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1121g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1122g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1123g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1124g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1125g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1126g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1127g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1128g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1129g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d112g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1130g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1131g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1132g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1133g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1134g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1135g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1136g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1137g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1138g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1139g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d113g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1140g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1141g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1142g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1143g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1144g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1145g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1146g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1147g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1148g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1149g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d114g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1150g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1151g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1152g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1153g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1154g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1155g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1156g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1157g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1158g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1159g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d115g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1160g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1161g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1162g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1163g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1164g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1165g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1166g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1167g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1168g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1169g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d116g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1170g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1171g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1172g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1173g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1174g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1175g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1176g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1177g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1178g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1179g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d117g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1180g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1181g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1182g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1183g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1184g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1185g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1186g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1187g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1188g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1189g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d118g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1190g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1191g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1192g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1193g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1194g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1195g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1196g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1197g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1198g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1199g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d119g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d11g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1200g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1201g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1202g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1203g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1204g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1205g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1206g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1207g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1208g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1209g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d120g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1210g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1211g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1212g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1213g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1214g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1215g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1216g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1217g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1218g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1219g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d121g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1220g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1221g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1222g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1223g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1224g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1225g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1226g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1227g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1228g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1229g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d122g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1230g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1231g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1232g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1233g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1234g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1235g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1236g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1237g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1238g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1239g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d123g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1240g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1241g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1242g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1243g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1244g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1245g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1246g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1247g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1248g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1249g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d124g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1250g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1251g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1252g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1253g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1254g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1255g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1256g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1257g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1258g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1259g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d125g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1260g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1261g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1262g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1263g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1264g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1265g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1266g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1267g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1268g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1269g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d126g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1270g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1271g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1272g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1273g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1274g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1275g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1276g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1277g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1278g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1279g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d127g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1280g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1281g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1282g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1283g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1284g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1285g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1286g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1287g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1288g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1289g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d128g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1290g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1291g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1292g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1293g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1294g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1295g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1296g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1297g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1298g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1299g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d129g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d12g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1300g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1301g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1302g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1303g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1304g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1305g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1306g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1307g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1308g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1309g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d130g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1310g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1311g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1312g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1313g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1314g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1315g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1316g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1317g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1318g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1319g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d131g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1320g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1321g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1322g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1323g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1324g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1325g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1326g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1327g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1328g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1329g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d132g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1330g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1331g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1332g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1333g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1334g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1335g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1336g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1337g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1338g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1339g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d133g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1340g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1341g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1342g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1343g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1344g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1345g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1346g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1347g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1348g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1349g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d134g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1350g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1351g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1352g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1353g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1354g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1355g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1356g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1357g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1358g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1359g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d135g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1360g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1361g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1362g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1363g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1364g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1365g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1366g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1367g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1368g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1369g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d136g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1370g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1371g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1372g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1373g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1374g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1375g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1376g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1377g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1378g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1379g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d137g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1380g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1381g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1382g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1383g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1384g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1385g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1386g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1387g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1388g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1389g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d138g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1390g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1391g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1392g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1393g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1394g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1395g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1396g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1397g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1398g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1399g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d139g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d13g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1400g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1401g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1402g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1403g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1404g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1405g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1406g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1407g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1408g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1409g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d140g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1410g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1411g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1412g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1413g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1414g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1415g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1416g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1417g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1418g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1419g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d141g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1420g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1421g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1422g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1423g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1424g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1425g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1426g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1427g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1428g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1429g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d142g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1430g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1431g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1432g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1433g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1434g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1435g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1436g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1437g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1438g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1439g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d143g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1440g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1441g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1442g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1443g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1444g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1445g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1446g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1447g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1448g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1449g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d144g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1450g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1451g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1452g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1453g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1454g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1455g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1456g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1457g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1458g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1459g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d145g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1460g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1461g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1462g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1463g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1464g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1465g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1466g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1467g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1468g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1469g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d146g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1470g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1471g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1472g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1473g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1474g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1475g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1476g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1477g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1478g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1479g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d147g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1480g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1481g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1482g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1483g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1484g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1485g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1486g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1487g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1488g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1489g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d148g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1490g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1491g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1492g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1493g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1494g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1495g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1496g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1497g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1498g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1499g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d149g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d14g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1500g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1501g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1502g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1503g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1504g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1505g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1506g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1507g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1508g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1509g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d150g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1510g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1511g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1512g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1513g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1514g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1515g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1516g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1517g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1518g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1519g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d151g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1520g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1521g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1522g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1523g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1524g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1525g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1526g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1527g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1528g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1529g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d152g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1530g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1531g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1532g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1533g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1534g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1535g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1536g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1537g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1538g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1539g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d153g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1540g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1541g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1542g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1543g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1544g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1545g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1546g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1547g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1548g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1549g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d154g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1550g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1551g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1552g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1553g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1554g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1555g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1556g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1557g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1558g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1559g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d155g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1560g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1561g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1562g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1563g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1564g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1565g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1566g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1567g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1568g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1569g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d156g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1570g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1571g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1572g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1573g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1574g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1575g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1576g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1577g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1578g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1579g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d157g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1580g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1581g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1582g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1583g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1584g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1585g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1586g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1587g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1588g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1589g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d158g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1590g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1591g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1592g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1593g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1594g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1595g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1596g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1597g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1598g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1599g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d159g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d15g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1600g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1601g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1602g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1603g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1604g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1605g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1606g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1607g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1608g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1609g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d160g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1610g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1611g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1612g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1613g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1614g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1615g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1616g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1617g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1618g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1619g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d161g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1620g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1621g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1622g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1623g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1624g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1625g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1626g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1627g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1628g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1629g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d162g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1630g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1631g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1632g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1633g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1634g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1635g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1636g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1637g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1638g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1639g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d163g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1640g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1641g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1642g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1643g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1644g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1645g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1646g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1647g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1648g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1649g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d164g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1650g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1651g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1652g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1653g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1654g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1655g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1656g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1657g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1658g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1659g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d165g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1660g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1661g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1662g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1663g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1664g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1665g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1666g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1667g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1668g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1669g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d166g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1670g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1671g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1672g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1673g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1674g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1675g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1676g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1677g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1678g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1679g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d167g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1680g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1681g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1682g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1683g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1684g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1685g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1686g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1687g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1688g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1689g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d168g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1690g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1691g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1692g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1693g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1694g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1695g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1696g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1697g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1698g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1699g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d169g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d16g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1700g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1701g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1702g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1703g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1704g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1705g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1706g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1707g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1708g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1709g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d170g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1710g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1711g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1712g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1713g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1714g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1715g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1716g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1717g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1718g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1719g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d171g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1720g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1721g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1722g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1723g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1724g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1725g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1726g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1727g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1728g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d172g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d173g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d174g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d175g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d176g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d177g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d178g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d179g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d17g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d180g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d181g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d182g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d183g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d184g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d185g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d186g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d187g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d188g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d189g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d18g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d190g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d191g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d192g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d193g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d194g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d195g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d196g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d197g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d198g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d199g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d19g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d200g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d201g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d202g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d203g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d204g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d205g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d206g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d207g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d208g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d209g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d20g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d210g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d211g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d212g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d213g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d214g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d215g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d216g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d217g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d218g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d219g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d21g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d220g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d221g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d222g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d223g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d224g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d225g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d226g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d227g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d228g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d229g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d22g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d230g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d231g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d232g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d233g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d234g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d235g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d236g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d237g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d238g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d239g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d23g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d240g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d241g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d242g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d243g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d244g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d245g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d246g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d247g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d248g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d249g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d24g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d250g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d251g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d252g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d253g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d254g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d255g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d256g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d257g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d258g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d259g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d25g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d260g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d261g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d262g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d263g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d264g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d265g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d266g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d267g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d268g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d269g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d26g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d270g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d271g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d272g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d273g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d274g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d275g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d276g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d277g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d278g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d279g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d27g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d280g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d281g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d282g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d283g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d284g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d285g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d286g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d287g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d288g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d289g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d28g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d290g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d291g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d292g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d293g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d294g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d295g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d296g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d297g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d298g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d299g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d29g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d2g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d300g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d301g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d302g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d303g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d304g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d305g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d306g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d307g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d308g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d309g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d30g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d310g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d311g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d312g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d313g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d314g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d315g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d316g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d317g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d318g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d319g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d31g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d320g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d321g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d322g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d323g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d324g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d325g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d326g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d327g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d328g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d329g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d32g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d330g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d331g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d332g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d333g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d334g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d335g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d336g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d337g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d338g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d339g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d33g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d340g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d341g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d342g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d343g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d344g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d345g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d346g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d347g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d348g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d349g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d34g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d350g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d351g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d352g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d353g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d354g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d355g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d356g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d357g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d358g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d359g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d35g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d360g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d361g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d362g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d363g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d364g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d365g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d366g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d367g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d368g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d369g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d36g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d370g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d371g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d372g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d373g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d374g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d375g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d376g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d377g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d378g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d379g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d37g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d380g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d381g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d382g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d383g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d384g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d385g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d386g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d387g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d388g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d389g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d38g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d390g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d391g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d392g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d393g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d394g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d395g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d396g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d397g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d398g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d399g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d39g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d3g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d400g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d401g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d402g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d403g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d404g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d405g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d406g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d407g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d408g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d409g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d40g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d410g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d411g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d412g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d413g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d414g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d415g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d416g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d417g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d418g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d419g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d41g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d420g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d421g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d422g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d423g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d424g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d425g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d426g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d427g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d428g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d429g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d42g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d430g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d431g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d432g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d433g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d434g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d435g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d436g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d437g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d438g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d439g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d43g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d440g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d441g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d442g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d443g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d444g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d445g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d446g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d447g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d448g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d449g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d44g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d450g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d451g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d452g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d453g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d454g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d455g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d456g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d457g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d458g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d459g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d45g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d460g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d461g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d462g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d463g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d464g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d465g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d466g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d467g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d468g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d469g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d46g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d470g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d471g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d472g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d473g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d474g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d475g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d476g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d477g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d478g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d479g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d47g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d480g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d481g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d482g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d483g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d484g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d485g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d486g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d487g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d488g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d489g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d48g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d490g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d491g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d492g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d493g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d494g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d495g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d496g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d497g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d498g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d499g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d49g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d4g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d500g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d501g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d502g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d503g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d504g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d505g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d506g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d507g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d508g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d509g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d50g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d510g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d511g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d512g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d513g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d514g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d515g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d516g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d517g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d518g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d519g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d51g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d520g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d521g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d522g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d523g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d524g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d525g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d526g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d527g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d528g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d529g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d52g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d530g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d531g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d532g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d533g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d534g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d535g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d536g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d537g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d538g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d539g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d53g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d540g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d541g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d542g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d543g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d544g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d545g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d546g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d547g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d548g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d549g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d54g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d550g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d551g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d552g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d553g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d554g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d555g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d556g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d557g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d558g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d559g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d55g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d560g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d561g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d562g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d563g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d564g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d565g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d566g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d567g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d568g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d569g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d56g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d570g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d571g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d572g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d573g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d574g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d575g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d576g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d577g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d578g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d579g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d57g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d580g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d581g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d582g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d583g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d584g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d585g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d586g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d587g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d588g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d589g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d58g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d590g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d591g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d592g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d593g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d594g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d595g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d596g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d597g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d598g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d599g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d59g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d5g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d600g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d601g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d602g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d603g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d604g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d605g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d606g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d607g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d608g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d609g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d60g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d610g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d611g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d612g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d613g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d614g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d615g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d616g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d617g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d618g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d619g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d61g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d620g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d621g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d622g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d623g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d624g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d625g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d626g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d627g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d628g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d629g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d62g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d630g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d631g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d632g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d633g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d634g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d635g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d636g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d637g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d638g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d639g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d63g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d640g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d641g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d642g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d643g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d644g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d645g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d646g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d647g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d648g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d649g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d64g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d650g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d651g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d652g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d653g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d654g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d655g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d656g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d657g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d658g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d659g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d65g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d660g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d661g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d662g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d663g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d664g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d665g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d666g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d667g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d668g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d669g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d66g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d670g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d671g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d672g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d673g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d674g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d675g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d676g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d677g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d678g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d679g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d67g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d680g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d681g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d682g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d683g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d684g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d685g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d686g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d687g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d688g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d689g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d68g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d690g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d691g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d692g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d693g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d694g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d695g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d696g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d697g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d698g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d699g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d69g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d6g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d700g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d701g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d702g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d703g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d704g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d705g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d706g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d707g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d708g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d709g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d70g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d710g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d711g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d712g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d713g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d714g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d715g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d716g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d717g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d718g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d719g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d71g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d720g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d721g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d722g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d723g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d724g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d725g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d726g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d727g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d728g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d729g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d72g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d730g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d731g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d732g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d733g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d734g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d735g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d736g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d737g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d738g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d739g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d73g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d740g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d741g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d742g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d743g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d744g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d745g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d746g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d747g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d748g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d749g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d74g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d750g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d751g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d752g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d753g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d754g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d755g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d756g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d757g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d758g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d759g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d75g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d760g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d761g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d762g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d763g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d764g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d765g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d766g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d767g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d768g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d769g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d76g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d770g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d771g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d772g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d773g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d774g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d775g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d776g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d777g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d778g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d779g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d77g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d780g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d781g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d782g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d783g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d784g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d785g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d786g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d787g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d788g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d789g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d78g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d790g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d791g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d792g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d793g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d794g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d795g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d796g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d797g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d798g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d799g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d79g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d7g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d800g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d801g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d802g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d803g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d804g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d805g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d806g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d807g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d808g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d809g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d80g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d810g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d811g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d812g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d813g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d814g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d815g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d816g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d817g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d818g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d819g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d81g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d820g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d821g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d822g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d823g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d824g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d825g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d826g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d827g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d828g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d829g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d82g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d830g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d831g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d832g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d833g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d834g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d835g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d836g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d837g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d838g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d839g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d83g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d840g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d841g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d842g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d843g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d844g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d845g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d846g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d847g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d848g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d849g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d84g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d850g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d851g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d852g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d853g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d854g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d855g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d856g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d857g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d858g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d859g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d85g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d860g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d861g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d862g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d863g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d864g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d865g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d866g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d867g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d868g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d869g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d86g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d870g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d871g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d872g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d873g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d874g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d875g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d876g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d877g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d878g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d879g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d87g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d880g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d881g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d882g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d883g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d884g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d885g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d886g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d887g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d888g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d889g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d88g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d890g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d891g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d892g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d893g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d894g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d895g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d896g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d897g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d898g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d899g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d89g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d8g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d900g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d901g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d902g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d903g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d904g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d905g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d906g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d907g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d908g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d909g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d90g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d910g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d911g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d912g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d913g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d914g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d915g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d916g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d917g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d918g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d919g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d91g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d920g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d921g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d922g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d923g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d924g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d925g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d926g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d927g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d928g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d929g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d92g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d930g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d931g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d932g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d933g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d934g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d935g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d936g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d937g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d938g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d939g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d93g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d940g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d941g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d942g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d943g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d944g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d945g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d946g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d947g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d948g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d949g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d94g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d950g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d951g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d952g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d953g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d954g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d955g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d956g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d957g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d958g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d959g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d95g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d960g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d961g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d962g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d963g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d964g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d965g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d966g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d967g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d968g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d969g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d96g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d970g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d971g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d972g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d973g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d974g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d975g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d976g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d977g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d978g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d979g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d97g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d980g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d981g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d982g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d983g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d984g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d985g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d986g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d987g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d988g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d989g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d98g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d990g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d991g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d992g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d993g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d994g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d995g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d996g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d997g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d998g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d999g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d99g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d9g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d0g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1000g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1001g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1002g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1003g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1004g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1005g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1006g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1007g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1008g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1009g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d100g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1010g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1011g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1012g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1013g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1014g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1015g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1016g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1017g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1018g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1019g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d101g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1020g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1021g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1022g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1023g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1024g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1025g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1026g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1027g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1028g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1029g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d102g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1030g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1031g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1032g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1033g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1034g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1035g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1036g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1037g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1038g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1039g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d103g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1040g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1041g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1042g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1043g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1044g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1045g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1046g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1047g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1048g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1049g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d104g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1050g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1051g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1052g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1053g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1054g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1055g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1056g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1057g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1058g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1059g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d105g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1060g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1061g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1062g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1063g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1064g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1065g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1066g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1067g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1068g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1069g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d106g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1070g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1071g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1072g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1073g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1074g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1075g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1076g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1077g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1078g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1079g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d107g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1080g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1081g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1082g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1083g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1084g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1085g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1086g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1087g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1088g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1089g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d108g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1090g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1091g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1092g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1093g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1094g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1095g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1096g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1097g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1098g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1099g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d109g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d10g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1100g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1101g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1102g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1103g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1104g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1105g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1106g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1107g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1108g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1109g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d110g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1110g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1111g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1112g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1113g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1114g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1115g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1116g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1117g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1118g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1119g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d111g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1120g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1121g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1122g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1123g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1124g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1125g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1126g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1127g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1128g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1129g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d112g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1130g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1131g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1132g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1133g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1134g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1135g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1136g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1137g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1138g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1139g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d113g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1140g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1141g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1142g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1143g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1144g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1145g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1146g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1147g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1148g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1149g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d114g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1150g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1151g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1152g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1153g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1154g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1155g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1156g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1157g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1158g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1159g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d115g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1160g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1161g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1162g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1163g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1164g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1165g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1166g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1167g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1168g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1169g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d116g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1170g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1171g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1172g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1173g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1174g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1175g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1176g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1177g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1178g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1179g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d117g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1180g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1181g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1182g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1183g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1184g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1185g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1186g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1187g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1188g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1189g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d118g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1190g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1191g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1192g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1193g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1194g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1195g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1196g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1197g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1198g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1199g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d119g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d11g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1200g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1201g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1202g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1203g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1204g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1205g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1206g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1207g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1208g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1209g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d120g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1210g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1211g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1212g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1213g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1214g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1215g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1216g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1217g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1218g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1219g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d121g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1220g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1221g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1222g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1223g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1224g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1225g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1226g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1227g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1228g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1229g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d122g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1230g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1231g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1232g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1233g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1234g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1235g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1236g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1237g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1238g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1239g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d123g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1240g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1241g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1242g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1243g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1244g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1245g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1246g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1247g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1248g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1249g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d124g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1250g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1251g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1252g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1253g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1254g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1255g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1256g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1257g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1258g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1259g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d125g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1260g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1261g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1262g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1263g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1264g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1265g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1266g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1267g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1268g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1269g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d126g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1270g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1271g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1272g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1273g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1274g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1275g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1276g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1277g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1278g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1279g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d127g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1280g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1281g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1282g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1283g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1284g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1285g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1286g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1287g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1288g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1289g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d128g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1290g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1291g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1292g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1293g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1294g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1295g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1296g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1297g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1298g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1299g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d129g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d12g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1300g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1301g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1302g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1303g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1304g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1305g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1306g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1307g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1308g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1309g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d130g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1310g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1311g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1312g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1313g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1314g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1315g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1316g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1317g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1318g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1319g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d131g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1320g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1321g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1322g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1323g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1324g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1325g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1326g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1327g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1328g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1329g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d132g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1330g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1331g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1332g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1333g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1334g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1335g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1336g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1337g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1338g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1339g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d133g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1340g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1341g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1342g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1343g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1344g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1345g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1346g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1347g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1348g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1349g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d134g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1350g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1351g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1352g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1353g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1354g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1355g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1356g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1357g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1358g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1359g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d135g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1360g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1361g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1362g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1363g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1364g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1365g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1366g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1367g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1368g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1369g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d136g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1370g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1371g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1372g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1373g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1374g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1375g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1376g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1377g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1378g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1379g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d137g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1380g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1381g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1382g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1383g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1384g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1385g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1386g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1387g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1388g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1389g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d138g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1390g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1391g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1392g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1393g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1394g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1395g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1396g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1397g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1398g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1399g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d139g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d13g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1400g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1401g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1402g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1403g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1404g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1405g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1406g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1407g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1408g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1409g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d140g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1410g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1411g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1412g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1413g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1414g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1415g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1416g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1417g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1418g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1419g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d141g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1420g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1421g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1422g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1423g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1424g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1425g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1426g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1427g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1428g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1429g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d142g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1430g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1431g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1432g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1433g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1434g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1435g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1436g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1437g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1438g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1439g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d143g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1440g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1441g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1442g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1443g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1444g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1445g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1446g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1447g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1448g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1449g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d144g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1450g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1451g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1452g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1453g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1454g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1455g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1456g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1457g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1458g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1459g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d145g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1460g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1461g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1462g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1463g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1464g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1465g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1466g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1467g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1468g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1469g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d146g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1470g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1471g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1472g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1473g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1474g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1475g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1476g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1477g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1478g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1479g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d147g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1480g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1481g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1482g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1483g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1484g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1485g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1486g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1487g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1488g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1489g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d148g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1490g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1491g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1492g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1493g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1494g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1495g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1496g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1497g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1498g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1499g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d149g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d14g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1500g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1501g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1502g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1503g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1504g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1505g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1506g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1507g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1508g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1509g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d150g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1510g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1511g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1512g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1513g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1514g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1515g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1516g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1517g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1518g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1519g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d151g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1520g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1521g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1522g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1523g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1524g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1525g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1526g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1527g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1528g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1529g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d152g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1530g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1531g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1532g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1533g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1534g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1535g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1536g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1537g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1538g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1539g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d153g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1540g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1541g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1542g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1543g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1544g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1545g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1546g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1547g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1548g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1549g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d154g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1550g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1551g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1552g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1553g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1554g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1555g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1556g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1557g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1558g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1559g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d155g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1560g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1561g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1562g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1563g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1564g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1565g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1566g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1567g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1568g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1569g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d156g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1570g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1571g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1572g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1573g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1574g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1575g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1576g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1577g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1578g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1579g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d157g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1580g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1581g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1582g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1583g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1584g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1585g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1586g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1587g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1588g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1589g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d158g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1590g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1591g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1592g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1593g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1594g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1595g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1596g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1597g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1598g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1599g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d159g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d15g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1600g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1601g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1602g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1603g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1604g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1605g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1606g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1607g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1608g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1609g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d160g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1610g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1611g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1612g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1613g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1614g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1615g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1616g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1617g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1618g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1619g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d161g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1620g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1621g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1622g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1623g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1624g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1625g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1626g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1627g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1628g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1629g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d162g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1630g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1631g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1632g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1633g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1634g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1635g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1636g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1637g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1638g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1639g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d163g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1640g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1641g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1642g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1643g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1644g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1645g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1646g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1647g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1648g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1649g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d164g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1650g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1651g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1652g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1653g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1654g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1655g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1656g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1657g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1658g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1659g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d165g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1660g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1661g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1662g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1663g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1664g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1665g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1666g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1667g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1668g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1669g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d166g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1670g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1671g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1672g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1673g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1674g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1675g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1676g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1677g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1678g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1679g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d167g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1680g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1681g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1682g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1683g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1684g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1685g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1686g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1687g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1688g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1689g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d168g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1690g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1691g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1692g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1693g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1694g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1695g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1696g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1697g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1698g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1699g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d169g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d16g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1700g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1701g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1702g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1703g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1704g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1705g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1706g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1707g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1708g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1709g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d170g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1710g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1711g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1712g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1713g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1714g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1715g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1716g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1717g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1718g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1719g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d171g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1720g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1721g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1722g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1723g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1724g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1725g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1726g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1727g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1728g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d172g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d173g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d174g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d175g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d176g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d177g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d178g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d179g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d17g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d180g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d181g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d182g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d183g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d184g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d185g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d186g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d187g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d188g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d189g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d18g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d190g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d191g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d192g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d193g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d194g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d195g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d196g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d197g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d198g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d199g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d19g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d200g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d201g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d202g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d203g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d204g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d205g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d206g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d207g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d208g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d209g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d20g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d210g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d211g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d212g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d213g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d214g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d215g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d216g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d217g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d218g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d219g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d21g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d220g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d221g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d222g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d223g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d224g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d225g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d226g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d227g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d228g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d229g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d22g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d230g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d231g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d232g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d233g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d234g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d235g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d236g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d237g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d238g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d239g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d23g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d240g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d241g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d242g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d243g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d244g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d245g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d246g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d247g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d248g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d249g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d24g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d250g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d251g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d252g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d253g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d254g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d255g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d256g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d257g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d258g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d259g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d25g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d260g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d261g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d262g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d263g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d264g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d265g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d266g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d267g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d268g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d269g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d26g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d270g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d271g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d272g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d273g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d274g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d275g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d276g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d277g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d278g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d279g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d27g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d280g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d281g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d282g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d283g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d284g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d285g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d286g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d287g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d288g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d289g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d28g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d290g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d291g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d292g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d293g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d294g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d295g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d296g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d297g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d298g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d299g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d29g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d2g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d300g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d301g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d302g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d303g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d304g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d305g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d306g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d307g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d308g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d309g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d30g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d310g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d311g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d312g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d313g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d314g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d315g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d316g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d317g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d318g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d319g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d31g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d320g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d321g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d322g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d323g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d324g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d325g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d326g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d327g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d328g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d329g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d32g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d330g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d331g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d332g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d333g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d334g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d335g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d336g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d337g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d338g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d339g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d33g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d340g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d341g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d342g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d343g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d344g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d345g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d346g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d347g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d348g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d349g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d34g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d350g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d351g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d352g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d353g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d354g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d355g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d356g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d357g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d358g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d359g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d35g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d360g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d361g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d362g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d363g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d364g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d365g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d366g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d367g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d368g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d369g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d36g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d370g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d371g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d372g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d373g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d374g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d375g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d376g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d377g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d378g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d379g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d37g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d380g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d381g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d382g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d383g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d384g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d385g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d386g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d387g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d388g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d389g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d38g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d390g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d391g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d392g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d393g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d394g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d395g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d396g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d397g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d398g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d399g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d39g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d3g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d400g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d401g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d402g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d403g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d404g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d405g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d406g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d407g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d408g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d409g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d40g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d410g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d411g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d412g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d413g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d414g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d415g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d416g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d417g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d418g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d419g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d41g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d420g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d421g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d422g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d423g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d424g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d425g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d426g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d427g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d428g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d429g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d42g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d430g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d431g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d432g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d433g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d434g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d435g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d436g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d437g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d438g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d439g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d43g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d440g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d441g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d442g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d443g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d444g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d445g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d446g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d447g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d448g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d449g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d44g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d450g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d451g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d452g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d453g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d454g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d455g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d456g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d457g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d458g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d459g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d45g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d460g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d461g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d462g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d463g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d464g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d465g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d466g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d467g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d468g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d469g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d46g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d470g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d471g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d472g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d473g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d474g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d475g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d476g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d477g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d478g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d479g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d47g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d480g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d481g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d482g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d483g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d484g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d485g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d486g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d487g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d488g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d489g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d48g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d490g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d491g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d492g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d493g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d494g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d495g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d496g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d497g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d498g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d499g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d49g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d4g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d500g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d501g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d502g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d503g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d504g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d505g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d506g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d507g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d508g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d509g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d50g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d510g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d511g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d512g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d513g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d514g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d515g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d516g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d517g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d518g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d519g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d51g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d520g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d521g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d522g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d523g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d524g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d525g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d526g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d527g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d528g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d529g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d52g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d530g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d531g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d532g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d533g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d534g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d535g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d536g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d537g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d538g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d539g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d53g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d540g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d541g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d542g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d543g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d544g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d545g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d546g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d547g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d548g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d549g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d54g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d550g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d551g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d552g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d553g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d554g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d555g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d556g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d557g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d558g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d559g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d55g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d560g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d561g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d562g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d563g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d564g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d565g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d566g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d567g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d568g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d569g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d56g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d570g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d571g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d572g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d573g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d574g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d575g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d576g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d577g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d578g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d579g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d57g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d580g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d581g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d582g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d583g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d584g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d585g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d586g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d587g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d588g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d589g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d58g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d590g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d591g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d592g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d593g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d594g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d595g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d596g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d597g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d598g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d599g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d59g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d5g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d600g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d601g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d602g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d603g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d604g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d605g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d606g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d607g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d608g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d609g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d60g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d610g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d611g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d612g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d613g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d614g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d615g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d616g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d617g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d618g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d619g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d61g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d620g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d621g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d622g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d623g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d624g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d625g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d626g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d627g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d628g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d629g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d62g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d630g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d631g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d632g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d633g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d634g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d635g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d636g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d637g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d638g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d639g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d63g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d640g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d641g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d642g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d643g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d644g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d645g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d646g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d647g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d648g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d649g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d64g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d650g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d651g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d652g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d653g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d654g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d655g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d656g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d657g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d658g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d659g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d65g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d660g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d661g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d662g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d663g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d664g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d665g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d666g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d667g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d668g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d669g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d66g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d670g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d671g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d672g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d673g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d674g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d675g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d676g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d677g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d678g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d679g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d67g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d680g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d681g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d682g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d683g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d684g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d685g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d686g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d687g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d688g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d689g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d68g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d690g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d691g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d692g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d693g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d694g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d695g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d696g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d697g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d698g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d699g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d69g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d6g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d700g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d701g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d702g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d703g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d704g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d705g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d706g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d707g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d708g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d709g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d70g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d710g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d711g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d712g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d713g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d714g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d715g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d716g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d717g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d718g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d719g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d71g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d720g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d721g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d722g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d723g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d724g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d725g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d726g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d727g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d728g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d729g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d72g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d730g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d731g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d732g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d733g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d734g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d735g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d736g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d737g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d738g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d739g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d73g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d740g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d741g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d742g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d743g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d744g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d745g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d746g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d747g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d748g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d749g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d74g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d750g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d751g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d752g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d753g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d754g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d755g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d756g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d757g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d758g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d759g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d75g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d760g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d761g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d762g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d763g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d764g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d765g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d766g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d767g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d768g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d769g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d76g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d770g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d771g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d772g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d773g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d774g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d775g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d776g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d777g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d778g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d779g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d77g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d780g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d781g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d782g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d783g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d784g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d785g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d786g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d787g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d788g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d789g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d78g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d790g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d791g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d792g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d793g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d794g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d795g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d796g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d797g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d798g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d799g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d79g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d7g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d800g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d801g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d802g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d803g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d804g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d805g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d806g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d807g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d808g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d809g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d80g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d810g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d811g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d812g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d813g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d814g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d815g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d816g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d817g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d818g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d819g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d81g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d820g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d821g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d822g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d823g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d824g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d825g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d826g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d827g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d828g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d829g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d82g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d830g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d831g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d832g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d833g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d834g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d835g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d836g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d837g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d838g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d839g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d83g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d840g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d841g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d842g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d843g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d844g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d845g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d846g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d847g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d848g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d849g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d84g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d850g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d851g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d852g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d853g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d854g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d855g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d856g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d857g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d858g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d859g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d85g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d860g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d861g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d862g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d863g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d864g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d865g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d866g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d867g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d868g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d869g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d86g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d870g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d871g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d872g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d873g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d874g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d875g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d876g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d877g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d878g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d879g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d87g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d880g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d881g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d882g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d883g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d884g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d885g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d886g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d887g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d888g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d889g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d88g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d890g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d891g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d892g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d893g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d894g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d895g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d896g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d897g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d898g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d899g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d89g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d8g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d900g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d901g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d902g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d903g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d904g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d905g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d906g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d907g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d908g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d909g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d90g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d910g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d911g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d912g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d913g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d914g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d915g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d916g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d917g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d918g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d919g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d91g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d920g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d921g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d922g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d923g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d924g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d925g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d926g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d927g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d928g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d929g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d92g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d930g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d931g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d932g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d933g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d934g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d935g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d936g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d937g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d938g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d939g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d93g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d940g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d941g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d942g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d943g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d944g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d945g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d946g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d947g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d948g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d949g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d94g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d950g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d951g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d952g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d953g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d954g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d955g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d956g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d957g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d958g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d959g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d95g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d960g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d961g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d962g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d963g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d964g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d965g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d966g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d967g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d968g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d969g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d96g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d970g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d971g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d972g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d973g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d974g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d975g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d976g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d977g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d978g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d979g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d97g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d980g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d981g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d982g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d983g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d984g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d985g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d986g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d987g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d988g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d989g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d98g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d990g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d991g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d992g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d993g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d994g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d995g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d996g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d997g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d998g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d999g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d99g0v0Filler.json
 create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d9g0v0Filler.json

(limited to 'src')

diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d0g0v0Filler.json
new file mode 100644
index 000000000..563e39add
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d0g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d0g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6000606452600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2d3378f63c4a87951f20de4ff17edd9af329fdced0155de2d2c527d9dc710fbb",
+                        "s" : "0x1e93795c85d4f55c5c22acebf1c06079f653e2c69df0c157180c270b0f96c8e0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1000g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1000g0v0Filler.json
new file mode 100644
index 000000000..6bcd2b97e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1000g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1000g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103e86064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcee9dea4248d515aeadc1dc546cb6d0fbf71a92576b53138c84aef648fccc619",
+                        "s" : "0xf95417ec51f5dc156685d227b306baf914f88d17b5ddf5ab9080399186bc68",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1001g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1001g0v0Filler.json
new file mode 100644
index 000000000..f1ab652e4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1001g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1001g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103e96064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1d58546b5b5c7643a13052cb5c51a169835024aa2451f7ffe7cf76e4ea708bbd",
+                        "s" : "0x2710dc12d91c71ed1bdfd03bceff7a58f9c88825b56ebb112d8babb78330f16f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1002g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1002g0v0Filler.json
new file mode 100644
index 000000000..759a72feb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1002g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1002g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ea6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf82137cebdec2df1488c60c129b095e8b948d5d02a90486470431c4cc062f21c",
+                        "s" : "0x2cc1165d6d392278ac23ad47a50cc1520dbb99130ba87293b2d0b296566d3769",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1003g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1003g0v0Filler.json
new file mode 100644
index 000000000..03f84ef6d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1003g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1003g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103eb6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7fa44aee31c86cd2b7f30e447a0618d14815112add5850643ce6cbb6eb403135",
+                        "s" : "0x73c9d620c60ead26ee4ab99ed54c9b617de4c8e653da31212a98699a08139d09",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1004g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1004g0v0Filler.json
new file mode 100644
index 000000000..47cb01988
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1004g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1004g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ec6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb4050d8fc6ce0f004af97154210995f2a213561a61e268faa094fb3400f34b0d",
+                        "s" : "0x614ffbc3bd44a286234025e552da34270c60155c16ff9bf469aa639d531b7768",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1005g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1005g0v0Filler.json
new file mode 100644
index 000000000..2503de410
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1005g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1005g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ed6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc33c8731c2bb15d27d3681fb21bc53c2c826149c389cd23979682a491c887a8f",
+                        "s" : "0x0f046c4805fc7f0b2aad905d9600b4e6c63726ec2999d84b21b112fbadf9f093",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1006g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1006g0v0Filler.json
new file mode 100644
index 000000000..a8aebbf5e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1006g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1006g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ee6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdc1f9e070d1b41bc0e3537bd12c94ce863047807120c7241be7984025d505625",
+                        "s" : "0x68a5468b3d73dc46e3e20e24ad5ee7957e228f00a0bf145f28e914b34696bc2d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1007g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1007g0v0Filler.json
new file mode 100644
index 000000000..729054411
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1007g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1007g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ef6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x74f565a20a9a4c3d9de6d8b2bc0247e8b205a12be7250dd8ee67796701e1dc60",
+                        "s" : "0x318755e2e623285047cd5e96d67b7b3377bc7b4af1ffe4ea20082550b4750f39",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1008g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1008g0v0Filler.json
new file mode 100644
index 000000000..a3f1e3053
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1008g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1008g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103f06064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe5f64c1d0d01d2b3ce0193481d5164ff8e7b1d4354937fe31dafcde710427521",
+                        "s" : "0x0d775ad004cf691f94fe6e31a8fc53a4222474fe29594adbfd0df884c8f7c523",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1009g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1009g0v0Filler.json
new file mode 100644
index 000000000..907f05c16
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1009g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1009g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103f16064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0bd52a2ad92d350b2563f1b4f8ff43f7bccf9482dad49c039e9fc6b07126440f",
+                        "s" : "0x1afc8c76342d6bb2aa494bec7b667551ccfac69b8be8aa99c7892ff37a5239d7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d100g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d100g0v0Filler.json
new file mode 100644
index 000000000..059295a05
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d100g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d100g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60646064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1307cae1bd796d7d99691bbe2559e36ad3820c6ba24e96157eb8bf600d3dbe64",
+                        "s" : "0x503a9f4399cb46d05adbe386a0f04afbf4edb4d20e10e8fac86374db73c2858f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1010g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1010g0v0Filler.json
new file mode 100644
index 000000000..9e3292527
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1010g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1010g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103f26064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd01d0cddb049082539c29faebd9877fb0d3737c42a207f4654451e0ee8ebb3c0",
+                        "s" : "0x38907b00780b0a47e74a3eb8779885d615ffcda81745d0b04e136e6b47acce69",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1011g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1011g0v0Filler.json
new file mode 100644
index 000000000..82fb4e263
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1011g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1011g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103f36064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7d1e3ff6cce989e9777929fe230422cf205583a550aca963bfd6642cc99a10ec",
+                        "s" : "0x197a7d9393ddb60b81b29af8467e47a63dc1388c164c3d289ad275ee82bcf34a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1012g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1012g0v0Filler.json
new file mode 100644
index 000000000..1402d3c43
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1012g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1012g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103f46064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc217520939b9f7c4fcebc7f4303630b59ed3c7515556de26c8871fbd43b19f87",
+                        "s" : "0x487629c65be630e917cd02fe7466ef2c9647d1eef0f6e3a68aa3769fcc2844c0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1013g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1013g0v0Filler.json
new file mode 100644
index 000000000..7fdb2e0a0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1013g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1013g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103f56064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x253b33ee81ae98230a66bbec1fad12c7e693f3085234409f59d8211762bddb94",
+                        "s" : "0x06c642d7219ebb3855b213e3f20109cb8fb1f2ed9ba720e8d23c36a3aae8c2d5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1014g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1014g0v0Filler.json
new file mode 100644
index 000000000..00f68b2d1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1014g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1014g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103f66064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf22c1e8f8adfc19911ac3e30c4452609a5f7264b37445e0776e8d04918f409a4",
+                        "s" : "0x1834aa2b84a0cf0c406ae02eb648c5d936a9dae7e7e6d924a8e7b850af2fb816",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1015g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1015g0v0Filler.json
new file mode 100644
index 000000000..e5807e097
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1015g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1015g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103f76064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x249eb985a6e6e04b40903768532db63fd0ec79669e1f91f92c8cad456a0f7d0e",
+                        "s" : "0x3028943da92d6c31b3ff99ad0fd5fb237efe90d5e86b4275350c838385ef2d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1016g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1016g0v0Filler.json
new file mode 100644
index 000000000..614f1bb73
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1016g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1016g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103f86064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5ed98561070f8c030f33f16f98c2eef86e09acc6780720d5810460d6ae78fb31",
+                        "s" : "0x1a539b7fed8105fb76aaebddca29c04f5b2ab0bc7abe09793ece7d3de01ce933",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1017g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1017g0v0Filler.json
new file mode 100644
index 000000000..0c0fdd27c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1017g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1017g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103f96064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x08a89e2f2594f64fb01ae90fdf7a6958b83de82f1f3b6e770b4937ed0a6f5cbb",
+                        "s" : "0x1e3eb07b6b775d18b85c85fba97eaf2387514c892b8c7502fe766b5535773096",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1018g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1018g0v0Filler.json
new file mode 100644
index 000000000..98f7ab18d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1018g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1018g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103fa6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xebdccb13cd4efe4fde8d662088cef09a460db8904e74863d003f5279097b39c9",
+                        "s" : "0x66156fe0cc98be63965105d721241626a66288265db5a573d217318f169048a5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1019g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1019g0v0Filler.json
new file mode 100644
index 000000000..a2aa9b4c9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1019g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1019g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103fb6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x28770845338ff04891d96e98bc1da7a10bcd453a052adca02ada4df2281c8307",
+                        "s" : "0x160fafdf62d8ea29432bcc55a51f087864ffce3e95c34187c82efded25286e1d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d101g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d101g0v0Filler.json
new file mode 100644
index 000000000..d96483cac
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d101g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d101g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60656064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4d004bf309582edecf6cde9c46d135a47dd5c696191a9f0d8c7dba45186152c8",
+                        "s" : "0x4f8c7cab345852e37637f6c4929d37313f0201fb5b9e7bfdc0ae9eef35f6befa",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1020g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1020g0v0Filler.json
new file mode 100644
index 000000000..a6dd85e29
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1020g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1020g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103fc6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3b2ad6d6d778d96ebde62a6fe40896b5c8c6ba0f210cff01e1c3d31fc1ccaa46",
+                        "s" : "0x13a320ebb7bf703098f2b97d099a46257325a9b41032bc0c86fbdc0e7ce10eb7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1021g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1021g0v0Filler.json
new file mode 100644
index 000000000..8958b249c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1021g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1021g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103fd6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9dcf2427e4815a211628a3fa8f7e2e5d5975d9e25726f4854852c8879baf896d",
+                        "s" : "0x15593fa4a158adf6a6bffc7ea4f0ac46df5619bfe9ade45b62f63abe8656fcbb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1022g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1022g0v0Filler.json
new file mode 100644
index 000000000..b5ed42573
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1022g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1022g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103fe6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcf88886d29b962e1cf414d7d6338c5c95df43eba7f4e97b97cb1abc7ce5ab4a6",
+                        "s" : "0x76c1d6a39805033fa4c00fcfd3728e7311509b5819217ccbae2edc0b7d13d64b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1023g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1023g0v0Filler.json
new file mode 100644
index 000000000..3cab2e494
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1023g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1023g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ff6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcbd8bea013600b48109b8ed7ff43ccb4b9f026eb522695900ff59f8f9e4dd8b9",
+                        "s" : "0x376f5d90144179ebbb78186569683d87687149fc7bff836e94fd14b646114fa6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1024g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1024g0v0Filler.json
new file mode 100644
index 000000000..6ce535197
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1024g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1024g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104006064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1b0412a91355d9f5bfdf2e91990d89fb437668e4b13366012a9259d87c96c55f",
+                        "s" : "0x07ef9fca283bd10337753d3b39f5d3bbb19b13996044dd49de8debf02be6e6d6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1025g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1025g0v0Filler.json
new file mode 100644
index 000000000..10c786700
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1025g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1025g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104016064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0214fb05a31257372057fbff9b07eb564f72da11c745d8cc596b8ba95ab222ad",
+                        "s" : "0x20323e45af72b3b6b3695b253af65c74642169b12c33a0e9b54d8ee4a2977ac3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1026g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1026g0v0Filler.json
new file mode 100644
index 000000000..e09328bb1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1026g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1026g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104026064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4a90724be7b43b2293b7e8405f113f2dbe30292abde7cb2ddab932fae9fab600",
+                        "s" : "0x6b223a3a285562fcdb57c5c9d9ca9d78a2cf0f8a0b793c3bf1f7aa1408c6715d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1027g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1027g0v0Filler.json
new file mode 100644
index 000000000..000eb8f8b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1027g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1027g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104036064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x39892a474a80a59850f3473c839c1bbc608e4b06acfa2eff06f56a637c099615",
+                        "s" : "0x2229d36894c40b4bf1b6934c97fd7f0f5f202cef1aac8f35afc7a84381bd0c50",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1028g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1028g0v0Filler.json
new file mode 100644
index 000000000..b9a2ca0a9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1028g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1028g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104046064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf2e40d65931417cdcbc3a17f3ca845084f9120e5f9b30537ac8b7dae3fef4d9e",
+                        "s" : "0x4c9941ec95c276436b6d6dcabb5a674b9de8adfef310bff7b2ae0b5a3ec0a59c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1029g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1029g0v0Filler.json
new file mode 100644
index 000000000..17b0eccf4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1029g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1029g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104056064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xefec566cb8b0ed78fd07b82fa6b22bc534dc13f9bcd842e5847bc4ddf7918e15",
+                        "s" : "0x30717792d84f18c2da5137e62b32bd451772d4f3f8b917f84bffed7901a92830",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d102g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d102g0v0Filler.json
new file mode 100644
index 000000000..3b64d71f2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d102g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d102g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60666064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8cb2bacd904981e4d94c3525107ba793dc03d91dcdc6dd05a9cfdd4c6ed8ee08",
+                        "s" : "0x37b3b3047b4fcc6d2e51472a72246c351622698f620401548dc411be2491ed8b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1030g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1030g0v0Filler.json
new file mode 100644
index 000000000..7e271ef69
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1030g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1030g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104066064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x59a6ef2643c9c815cb0574dc068c5eb273d9b6fd6c87de5ce8fa874bf37cad9a",
+                        "s" : "0x3283b68d1589eb25b34cc95c1a808f0e967131a09a0b27a461a825026d6bee24",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1031g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1031g0v0Filler.json
new file mode 100644
index 000000000..c3fc94cfb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1031g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1031g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104076064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3676afbb11ffda3eedff0297a292017e24afe5229b4811eaf9b64a20db557ffa",
+                        "s" : "0x4da0bb2ac57a8a1393dba8a48029e51228a4cd1d46b6cd46475a2ab93c91f560",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1032g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1032g0v0Filler.json
new file mode 100644
index 000000000..523887b7b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1032g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1032g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104086064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x362432a49ac92a3320c4a692b42c3b19aaed617f920136b677fca63f852f705f",
+                        "s" : "0x43d50acaeed5cac1397efb1a4e178025f75b5ec4c2d5209fa0703dff7b97c82b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1033g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1033g0v0Filler.json
new file mode 100644
index 000000000..d4d349c20
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1033g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1033g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104096064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x67a1fca1c1398fe79a3d0519efd05d86693af7f840378da25a75c51fc18087ad",
+                        "s" : "0x2d714f1a74e73b8e08be21427a39d47cd111140c9d04638c649b6b494000e41f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1034g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1034g0v0Filler.json
new file mode 100644
index 000000000..02c65a993
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1034g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1034g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61040a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x154083a896f7407a6e8d9c315883e25e442aded4094582148ad5cffb47a828bb",
+                        "s" : "0x46dda1c874a7f610bad2412f778f7a428d09529cd90278a7b6bbbae48db7f5cd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1035g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1035g0v0Filler.json
new file mode 100644
index 000000000..50f82d95c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1035g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1035g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61040b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9b24e2be7142f2e6d52a55e554f4310ed24c1b48c5ea3a174b4d76b91668b49a",
+                        "s" : "0x2f6795924afb170f18823ca34f051f14882828dace376020f777e2c72027beaf",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1036g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1036g0v0Filler.json
new file mode 100644
index 000000000..3441dd2ff
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1036g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1036g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61040c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x604990948c1c1152d4cd2826eec87a4ad887dfd1deef47cb09b65620f0330342",
+                        "s" : "0x43a87782dd5b8c515b76a8045ac8a2d6e5745c735b0eab75d966b1a8e1bd688a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1037g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1037g0v0Filler.json
new file mode 100644
index 000000000..a9d38a15c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1037g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1037g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61040d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x87fc9a5d6ad300bcc815af27aceb4d3bea5083aad07c1e2c935f00cb70176c14",
+                        "s" : "0x4d0f1d60c14f1281e3d8068975b509837b344305e8b6839880a653d2f2c25a1a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1038g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1038g0v0Filler.json
new file mode 100644
index 000000000..b9e713260
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1038g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1038g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61040e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6fec6646a7933001202527381aa0c38032dace82925a026eda59ae7e6a8e5557",
+                        "s" : "0xa1e2fbb750c9a97f5747c6b05457fdcf36365f264da91531cf5340dd40deab",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1039g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1039g0v0Filler.json
new file mode 100644
index 000000000..ebdfecb17
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1039g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1039g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61040f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9dc32aaec16ede4f2a441c29cd36b8782dcad4be101eb248a079c57ade732e2c",
+                        "s" : "0x318fcd3a4e738a9c19d89b76d44148f9ae79ade712e2f9f87e461c5408e13dd7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d103g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d103g0v0Filler.json
new file mode 100644
index 000000000..9d54566da
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d103g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d103g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60676064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x08d68c7d9e70814c0b81e4974c3bba46dfa2273d26eefdfccad229f512a7161b",
+                        "s" : "0x6a30b4c24f4775249085967a03aa5005506d1c36bf5fa324eb4dbe867ffdf1d8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1040g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1040g0v0Filler.json
new file mode 100644
index 000000000..8802bd170
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1040g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1040g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104106064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3cc0de7ed99075db9624277278138f902d1fd3f61cca2c77565816469a595673",
+                        "s" : "0x50993bd17024f79925c29ec8bd413ce7e8ec98bf246fdd7f209d9f9a44b8718b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1041g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1041g0v0Filler.json
new file mode 100644
index 000000000..4f17c69e8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1041g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1041g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104116064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x202846bfe19c8d3e236f09ce97a6bb38397a945b844eeef814db94b93acbbc83",
+                        "s" : "0x13eda148dc43de64711f1136e54e7b16635d9ecd6bd183a41459da44f6cb31da",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1042g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1042g0v0Filler.json
new file mode 100644
index 000000000..9b52ab1d9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1042g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1042g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104126064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3edac518b1b78d3fd59d34ff3a553d36688c4db13d8572c9f1b16de2ed7e11e1",
+                        "s" : "0x72fc94d78689d7881ce454e9086577e7bcae52e4462e666d40505509b4b543f4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1043g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1043g0v0Filler.json
new file mode 100644
index 000000000..cb9882316
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1043g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1043g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104136064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe129eea0e3719a943ca1183ec77fb1a29e2bd2d282e4807339514be990a4d4ca",
+                        "s" : "0x02d1ce00652195057210f5be73c3afa1e0ea98c06901436c2148db76b29bbaa0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1044g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1044g0v0Filler.json
new file mode 100644
index 000000000..2fd593c65
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1044g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1044g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104146064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x934fc1837f7795a64f9de796318a0b95775bd7338d92eedf8bbd9e2e1ca914c1",
+                        "s" : "0x158d81ebf8f377fcaa8f423de9b8f6a9a4cc237a6664bb242ccf1c72fc1ed1a1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1045g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1045g0v0Filler.json
new file mode 100644
index 000000000..71bace4cb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1045g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1045g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104156064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbb12407f68e0980751da3368ce71f8cfa98acd059167724e2452603e22aa0442",
+                        "s" : "0x5fcf91408b5e889ba1e4657b7ae5c34f931e4f6beac3ba45d710b2fdf89ba27f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1046g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1046g0v0Filler.json
new file mode 100644
index 000000000..915a3321d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1046g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1046g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104166064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x74c2b5f2414ae4f89534517887b8bd6e131723f50a5aa74317b109720e778df0",
+                        "s" : "0x03809bde47f433a04ce5070cfef67e982e1b1abf548324f67f6d76cae5c73919",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1047g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1047g0v0Filler.json
new file mode 100644
index 000000000..7617a9db5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1047g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1047g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104176064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x21834bf8691ac3e136330434a6b603e1d7518e7277dd6b663379ab624b1c2cbb",
+                        "s" : "0x599e2e558f78e4ac52194a1f0fb80b23648a68bd3db28191a0258a0df70949bc",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1048g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1048g0v0Filler.json
new file mode 100644
index 000000000..e66612058
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1048g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1048g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104186064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc25824b93d63c52591631ed4d9f10df84f85bfa0913744d2bba7ec08f02b4fc5",
+                        "s" : "0x28d5dd3c3af9f10cf92d4018fb4229c6b20242721cd52d4fd0d529e4b12d1bd7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1049g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1049g0v0Filler.json
new file mode 100644
index 000000000..5929ec6ab
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1049g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1049g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104196064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdd6df0ccfc10daef188832502eb25746e8a5d388cdd039df10d3c894bf417800",
+                        "s" : "0x37943d5f25bce09ba9661220432605b3ca508f625f3434c2f0c72737cd47879c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d104g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d104g0v0Filler.json
new file mode 100644
index 000000000..8ad931e6e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d104g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d104g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60686064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe6e3852b5a48f73728d5c2ef7021185c72c426ee21f49499d50950d33e9a6c9f",
+                        "s" : "0x3f3abcca9a7be95ba1a9b2c2077ab10bca7c6457b340cfcd2e6d76d6a4affc1b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1050g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1050g0v0Filler.json
new file mode 100644
index 000000000..5e2359a28
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1050g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1050g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61041a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x898f015253961cf00020d1e371c824b4eb55368242194e35a39ebb2465aecb12",
+                        "s" : "0x2651cd272cc2fed046e45685c47810ce5f602d7b29739231fbd471c6559e421c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1051g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1051g0v0Filler.json
new file mode 100644
index 000000000..0d03426db
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1051g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1051g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61041b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcda73c36dff7a7f6b20cc3a5fd6af2fa514d8e85fc74f7c40f57e056585eca14",
+                        "s" : "0x4556b8f486662da6f2386a00cd06f4ae1d84c7953d10637dfd2435b804efcc52",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1052g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1052g0v0Filler.json
new file mode 100644
index 000000000..cfdeac707
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1052g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1052g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61041c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x143ddd24354b8d20f69c39fe36a80501abc331ace6db889622112bc3d76ddcd2",
+                        "s" : "0x0c9b91d2fcd589cac3ea352630ac7e05ee943c9439a0e33f00806fc24870ce1b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1053g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1053g0v0Filler.json
new file mode 100644
index 000000000..bcfa48f8f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1053g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1053g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61041d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc8e060af831877df561c25c632db9722b0cb6079dc11c954e7656e71bd969ce5",
+                        "s" : "0x6d7c216330896ffb56aefe0ecc297c25a3d04c963e2c9cec50995e89253cb4a0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1054g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1054g0v0Filler.json
new file mode 100644
index 000000000..1a94233fe
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1054g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1054g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61041e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xce0c0dc8ff5b8dceefb29c9dbc8a1254300c3bf655e1d50f812dbc656dd3a09c",
+                        "s" : "0x54f4ffd3defe7a94b27af304f488954f150a197f39ce39ca2c7f24c36be059da",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1055g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1055g0v0Filler.json
new file mode 100644
index 000000000..d110c4f41
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1055g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1055g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61041f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7e98ed5388068aeab89686b05bbcc86e007ba355ec4a7880c67fe2ceba0b4296",
+                        "s" : "0x030afe4b9ae1afc7be0984e4bb094cddb69b58fd000496076247647d48150f71",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1056g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1056g0v0Filler.json
new file mode 100644
index 000000000..45d0fd8c9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1056g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1056g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104206064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x75ffac98bf69de710a172e9b4a20df6d1e788e46bf40c3f19cdd8d0d15e9ec62",
+                        "s" : "0x4993aa274bb76a4083c5f271e7634d9a00ac90a7cf6b65ae8503f1953b355979",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1057g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1057g0v0Filler.json
new file mode 100644
index 000000000..46d2eb9aa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1057g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1057g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104216064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x12269a498c19412ca37e2060bf068b32b9fc805d9e0ae5012c9e52d551499280",
+                        "s" : "0x328b56c67b9f81936ae400623aef3098d1083e4a9691e3539b6f4c2f8468de73",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1058g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1058g0v0Filler.json
new file mode 100644
index 000000000..fb5456ad5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1058g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1058g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104226064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf7cce682b07ecd973ce9f9d686a0db853a478496f9a9a21cbabdfb7acebddd2b",
+                        "s" : "0x1a4443bdf0ab28bb52877e436846b919de4f4248dab7359e3c605510f0dcf4ff",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1059g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1059g0v0Filler.json
new file mode 100644
index 000000000..82ace7813
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1059g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1059g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104236064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6ed7d5bcb5d1d853951e93b7566e9fd35c9a348a61ea7184149e237f1d0486ae",
+                        "s" : "0x4481e75772e307f77114d24527a296bee10e8fb8d4ca6a13da77cd45bba90400",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d105g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d105g0v0Filler.json
new file mode 100644
index 000000000..16e723357
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d105g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d105g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60696064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x842e04caa9ccdf9cba3690e83ae8fde1bd93bf59a053aa83891f241baf4bae76",
+                        "s" : "0x5e271b593efd5219571757710de7c3367eb81bee6cad24b97411fdfb5d5ef6d9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1060g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1060g0v0Filler.json
new file mode 100644
index 000000000..3e392961a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1060g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1060g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104246064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x01f0cae2a894487e64a023dd38846fd0bca4b9bf95b0e3a2b3e643ea6a826fb9",
+                        "s" : "0x27b27b0204fb00089373651bd01590f3f62c6982ca5449a0c6c61119fa2b3c84",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1061g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1061g0v0Filler.json
new file mode 100644
index 000000000..14e567b7d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1061g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1061g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104256064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb82f44c367d97b677b0a0e1e2466fe555e6101aee6deafe0222e6af187fe4852",
+                        "s" : "0x6d8f77c926792753e5159f3e5b7ec0e72d678ab603d72b4a732b2200d9aa6a9f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1062g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1062g0v0Filler.json
new file mode 100644
index 000000000..d4981b458
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1062g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1062g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104266064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfbe394b09cde77b49d0164f937d09110e2017de864278e25f05a4cf5ededad4f",
+                        "s" : "0x5bfab195b6aa219b58ded4803b3db728566a0e9fa1aa106bd15ebff44088ed8d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1063g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1063g0v0Filler.json
new file mode 100644
index 000000000..893763752
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1063g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1063g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104276064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfad3477738ac7a5438c7f1f001a27ab079f6e176cfce9da490f1c16a0d49f7bc",
+                        "s" : "0x43727493e1c82286f44b1c01e7b48c6c62bd525c4e4d765ffdaa3b2a3c005cfb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1064g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1064g0v0Filler.json
new file mode 100644
index 000000000..29e9f7f71
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1064g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1064g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104286064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x646f22eadeae5cd95cc0e88c17f8b55d61cd5bdb14c5f16fcfea95c7964d7273",
+                        "s" : "0x351ab664f2ae5ccb0eafd7c7dc21e5fea2197259e89573c6c26abb210994420b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1065g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1065g0v0Filler.json
new file mode 100644
index 000000000..1faf4ddf6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1065g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1065g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104296064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb46a691f7a77c053d44060d16fa1e946d977bd84b41b84a8f333721fe93e894e",
+                        "s" : "0x0819c8dda5193b8bc8d58ebf590a82eecd35bcc840c4a60ec1935f80f9417754",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1066g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1066g0v0Filler.json
new file mode 100644
index 000000000..c9471fd7e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1066g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1066g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61042a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc0b31bd2095d8068fc1bc5c82bb36698340f81b7975997bf0bf98f4edf580b1a",
+                        "s" : "0x0cbc64b8239d1a8610a7a00158595672d3a48dcbd18a5256567fb466378772cc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1067g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1067g0v0Filler.json
new file mode 100644
index 000000000..b171b2818
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1067g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1067g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61042b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x44c1a2febe894dedd116fafe13d221492759b05b77beb265943ce539a047a820",
+                        "s" : "0x04b736705d161a95a202e88c77bb72ffaa61bc8c046fe4a1b3dee29dc8652c8a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1068g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1068g0v0Filler.json
new file mode 100644
index 000000000..912ec9fe3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1068g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1068g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61042c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf25a3975a4ffbdb79434edc3604475f04034c0cfc0fc15fb65da1a9a3ebf9c0d",
+                        "s" : "0x204385f2c8d6f9f93416596555f2a1ea81bba1ecc4e052ff361e2904ac7a3d38",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1069g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1069g0v0Filler.json
new file mode 100644
index 000000000..7a15dc3ef
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1069g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1069g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61042d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5c40a48b6c7977492602159e2c2746290f57a90dd7fb64166e9eaaa858692709",
+                        "s" : "0x3e44ab1de1ec2a8c37ed086b80cbaa5549967e44a5bf775df4a37e372d6eb406",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d106g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d106g0v0Filler.json
new file mode 100644
index 000000000..ed859f429
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d106g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d106g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x606a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x960f586a2d34a38da61c84ecea10dd56c3800212ddc805f2b981b4b5129af808",
+                        "s" : "0x5651d31988182ef316812178e28716ed6e39048e64639504de4851b500b8f09e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1070g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1070g0v0Filler.json
new file mode 100644
index 000000000..6236169e0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1070g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1070g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61042e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf4ca0f0f11304a32ed6b1c90385636d39d0c473196b7b4c4000a04e9d46cdc87",
+                        "s" : "0x4200fccb27950c5501c20def2e9b05762ae0cef8cac2b0c974f076ffee7ed942",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1071g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1071g0v0Filler.json
new file mode 100644
index 000000000..cbb89eded
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1071g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1071g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61042f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4106d3ee1ac75e375d492f6f562797798dcdc5f3a6ad1f41ded97581e00234d1",
+                        "s" : "0x4e1a4ee7b1d4762956b26dd6cac0a40120f076e7ccf232bf4ff72a569d04c734",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1072g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1072g0v0Filler.json
new file mode 100644
index 000000000..4a182ade5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1072g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1072g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104306064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1ea8b9fe978508ab92632b9ddd6b670a3fe53f7eb3fddae546ee65d6c3a9d365",
+                        "s" : "0x28e298b45a7d793e051c89d75cc20e42535eca1112bdfce8b535b9283311eedb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1073g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1073g0v0Filler.json
new file mode 100644
index 000000000..83363da67
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1073g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1073g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104316064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4d5d89fed2f08fe40f84759beb302b360295aedefdb419119582ae1a09c28910",
+                        "s" : "0x58d7777f2b086d49b1121ff93bea4f9380ae1ecfcc5b5bbe21bb28d2217399e8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1074g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1074g0v0Filler.json
new file mode 100644
index 000000000..888465e22
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1074g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1074g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104326064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8f76237963df73026e161667c35300651a2413eaab158e52d11f067cfbaa8dfe",
+                        "s" : "0x97f85f493476e37afc7e6a253ba06e466f36cc5723e8b065d20b71386f7a24",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1075g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1075g0v0Filler.json
new file mode 100644
index 000000000..a189d4411
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1075g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1075g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104336064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf3043fd08d57c6d5d3ea1bc608b00b4c11e4eef65ce89638768f2e8f1eb10262",
+                        "s" : "0x174f1c1cdfba24d14f451394096cc18551ddb57c98d42a9e2147fb2258ef1bc0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1076g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1076g0v0Filler.json
new file mode 100644
index 000000000..e23e70a78
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1076g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1076g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104346064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf3a5a07680c03cb4f9915652e13cd24ed87522f63a3cb425ac413d13d680b220",
+                        "s" : "0x2f6873e72b4ef381fd73c98eda360b0fdf7f4a17477be90aa4b12a34bae2009e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1077g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1077g0v0Filler.json
new file mode 100644
index 000000000..090c9c4a5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1077g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1077g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104356064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe8d8ca531ebf1189f0d550a4336eef1b9a4b046295f2d76988d026506e862251",
+                        "s" : "0x275dd3226fd4b8937a0083b6fa7e3e74259b521acd5aac6e6788bee0ed2b1b04",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1078g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1078g0v0Filler.json
new file mode 100644
index 000000000..d6dbe115a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1078g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1078g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104366064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa7fe592b277e4acd19bb59530900cba4a5ee767f1485f751891c1ad9b92d1402",
+                        "s" : "0x2339e3d74b25cbdd16e886d649c792dacc6f50f225883a315ff7c3d0a24e910e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1079g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1079g0v0Filler.json
new file mode 100644
index 000000000..e1a5bd104
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1079g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1079g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104376064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x03294dc17f67e286c02d245d74bfff5a081d227b12b58500b0816dc2694b157e",
+                        "s" : "0x24d1d5aa83e05afc5bb54d9636f1756a2a09d43c79b084a1ddf1a5cec1b247d5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d107g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d107g0v0Filler.json
new file mode 100644
index 000000000..876124b0c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d107g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d107g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x606b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x894f3da4f862696fdf2455a438c1427aac7f62da086422ec228c281c2dc7efed",
+                        "s" : "0x2a8baa4460265766ed62e44e8da0deabe5b683c3a5fbcdde8138d217d10492ce",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1080g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1080g0v0Filler.json
new file mode 100644
index 000000000..91e472ff8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1080g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1080g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104386064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6e8aacd5c77879378b4d5538eb2b2c409d38a3006cf454f8f7975035ed431b8f",
+                        "s" : "0x367270d0b1d2cd4a9507756e06905a2b340b849fa9d77930ce57d70db3b2afa3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1081g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1081g0v0Filler.json
new file mode 100644
index 000000000..7a962fdc9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1081g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1081g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104396064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeba0be1245d6a03e374f8e92fb7b77e81df1c5a17b1521cf10dd16426bfc1746",
+                        "s" : "0x1d29ae669228e2707fe235e7b75943ca0061b984d9b9cd66b67cdf7ba12a0b5b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1082g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1082g0v0Filler.json
new file mode 100644
index 000000000..18a896eab
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1082g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1082g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61043a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf151082aa055efe6e8664c52d43d3eea84dd4a8f0c81b9b511833e1adf40cf8a",
+                        "s" : "0x1e196aefa4177833c9f4bc8b68d50a3dfc55ae871a527842997b55afb6643069",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1083g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1083g0v0Filler.json
new file mode 100644
index 000000000..e4484b06d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1083g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1083g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61043b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb5f6665f1d3b6e9826d739cd95f803d001550da56aa1de718eff08ebb4e6c7b5",
+                        "s" : "0x70eba46b37e06df5019a04c1f612ae943f94ab5f09899c47138d79944926e5d9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1084g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1084g0v0Filler.json
new file mode 100644
index 000000000..22c8fb035
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1084g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1084g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61043c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1c81b439ada015d285e0f4da32bc5538573ccc3c9596a77bace2dc3a99256e48",
+                        "s" : "0x39b26d7d269d0c81c8712f12bc7b235f9d9933271d2528d3f31de66b7eeb1685",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1085g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1085g0v0Filler.json
new file mode 100644
index 000000000..63066b255
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1085g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1085g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61043d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb814200751e58e05ae1d7885ee5316f6396800435b9069cd819401477bd0e9e7",
+                        "s" : "0x183ed189b442e1694f5c95523db94b1fc2494db350cfeb64653f31a61a2cdf10",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1086g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1086g0v0Filler.json
new file mode 100644
index 000000000..db295b328
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1086g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1086g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61043e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb4fb6fa8a8883846b55f9595b02d3d8fbee00c8318c84be48f74f7251544ed88",
+                        "s" : "0x55e680f80532ba739612985d6ada97218de56824ec8c69f4301095eca915cca5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1087g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1087g0v0Filler.json
new file mode 100644
index 000000000..7b4825929
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1087g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1087g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61043f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xef5fe67fae081ec269d86b05290cbd35167be6f2ed58ce1d502acd20ac2725a0",
+                        "s" : "0x7bbb3b3709c1543bcaf47bbc639b1705698f51ca87110feb8bfce6967a839758",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1088g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1088g0v0Filler.json
new file mode 100644
index 000000000..096f98805
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1088g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1088g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104406064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x21e980b7792fa4c6d550cc66a63394aaca74d52a86d55063de2b47807de9b348",
+                        "s" : "0x5be26a1fccc4ec72c20f31b02167d4f99bd8c59fd7da3f517970b0e817c64e64",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1089g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1089g0v0Filler.json
new file mode 100644
index 000000000..a30cb8ac4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1089g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1089g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104416064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6f1aedecc15973d098328b7b313720bfbd371505c779ac25dd9c6a1edcb8993b",
+                        "s" : "0x0a25881c355e65e5140a13b74d3db0aa44f06b871b0ba1c92a2d0d5b774fe335",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d108g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d108g0v0Filler.json
new file mode 100644
index 000000000..b2172efcc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d108g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d108g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x606c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x528b95e901bf56f7965cc5c7da759ad60e978bc9c43d43ac926cfadc3c3a5073",
+                        "s" : "0x1d05817eee3729b527b2f2c28c93d0cc69c801068c7bb7ab2f68fc8e22aa895d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1090g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1090g0v0Filler.json
new file mode 100644
index 000000000..0bdbc82bb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1090g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1090g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104426064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8cafafb8caebcd07dfe434ec129558a3cbb4ecaac5fd1c465e3a8b1212d2b47b",
+                        "s" : "0x1cda34a98e9c5ca80f6bf03b465b7c7a4bf6786c6c5ca6c93881f0e50b6c78b7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1091g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1091g0v0Filler.json
new file mode 100644
index 000000000..8c19769c6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1091g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1091g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104436064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe4ca0b0b617aa37dcd615c7e83eef6c49d513f8503bba6052a57c8b6ef61c387",
+                        "s" : "0x5aaa7806718def3bf88cb33a5a2fc4568f42bcf355b61ed42dbf219de9b1d293",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1092g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1092g0v0Filler.json
new file mode 100644
index 000000000..763a76a4f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1092g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1092g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104446064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8e323c92b90e7182f7d5312253ba5c7d5a22d0e538e1977730dc5859ff436c2d",
+                        "s" : "0x35e93362d4c7efcfa522852119dda92e1621f59861e9f4977d2a8d00f0dbd507",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1093g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1093g0v0Filler.json
new file mode 100644
index 000000000..9093fdab3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1093g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1093g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104456064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x19cf75cca9521052db971c525f244fcf803e1338ed77337c9bfe48381793a2f6",
+                        "s" : "0x3d67a82367e7ba870937c6ef6ac7705afa62b8fc5a2adfe3480cffc361974ccd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1094g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1094g0v0Filler.json
new file mode 100644
index 000000000..0207d6f9b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1094g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1094g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104466064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4f6c9d4f5e02322a6407adcbf64731340aa60db5af80c19ee250ece42ef6cf90",
+                        "s" : "0x789f17951c95ab825585d34319ff30e462ec359c003ef98d3c6dee6ad11e4d57",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1095g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1095g0v0Filler.json
new file mode 100644
index 000000000..ba3a6d301
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1095g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1095g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104476064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdc064cdd6d5d18b831e93cc0a79168222bb21427e106e3f647bbb77d292936c0",
+                        "s" : "0x1a65259dbb34d8aebfb5be5802d5f9fbe3524b82a56e789554f63ccf1b31f9e5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1096g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1096g0v0Filler.json
new file mode 100644
index 000000000..6a0e0bdf6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1096g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1096g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104486064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdf2a34c880d384eb13f9a89b960d67b37ac2146ca048588b25df7f143c244a56",
+                        "s" : "0x3af6f99e59471ccea3d30f28ffa69203daded7addbe45a13b4971a41646b50ce",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1097g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1097g0v0Filler.json
new file mode 100644
index 000000000..76ba51ec3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1097g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1097g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104496064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd9e5b7d07e774f261b2218a1b44431ee13020f49890cf516a2f7dfcd9e4227be",
+                        "s" : "0x2ce227ff0e3b5fc618f7b9080ade007fac1047626a55707f904e4c506cbb8231",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1098g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1098g0v0Filler.json
new file mode 100644
index 000000000..dfd860ce4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1098g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1098g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61044a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x92c945f8c7a3031d4ff78f2554117a34d4e65211974ed6feb8ea2cdf890f4332",
+                        "s" : "0x397a4e93c9ed38b0a95a060d697f321db322221876b5751c8a50e863b759b962",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1099g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1099g0v0Filler.json
new file mode 100644
index 000000000..1ecfa4b41
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1099g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1099g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61044b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdd1a14d7e77b904c6e0b46a6d6ef04203a3e1c7324b8f0994b4979f37845444e",
+                        "s" : "0x0f68e72fc2c97b5e39b28f8533aece0af7bb742107cb62f5fd581b46c6c3b84c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d109g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d109g0v0Filler.json
new file mode 100644
index 000000000..4c76789f4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d109g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d109g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x606d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0c65cb991aba5f1fd8bf52bc020c52ead833ba488ed7f22b1cbc1406d1389a44",
+                        "s" : "0x6190f18f8c87ac0d94c4a4953aca1bb0fa9dbd698db409293c5b9fa9306440ce",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d10g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d10g0v0Filler.json
new file mode 100644
index 000000000..db343b6c2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d10g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d10g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x600a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x670252d4038db75f240c1cdea475839f6c54f630f2c5d5b587a6d94ff493c4db",
+                        "s" : "0x5857d8b90b5979ac41cf7c5869f6aba051d2f966d2fc25906844bee89a4d5c3c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1100g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1100g0v0Filler.json
new file mode 100644
index 000000000..94f7e8227
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1100g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1100g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61044c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x87425617399e71c551c834e05f2cfa60c0c2bedcd40e5432a9ffaa7a5fa414df",
+                        "s" : "0x1a0baed59d17598d3ee4558a160d7b0747fa03479da7889e274d2c5c6d61fcbc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1101g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1101g0v0Filler.json
new file mode 100644
index 000000000..b2d7e6218
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1101g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1101g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61044d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x03aaeef51a57863cd0a85c109c1fb26c2f7e2e8e4e2f9c5c6b74ee1b0ba8c223",
+                        "s" : "0x6210524e867dbc1c357094e2999fff715acae46f122b8f791d64f197a8d87d82",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1102g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1102g0v0Filler.json
new file mode 100644
index 000000000..a6c4e122e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1102g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1102g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61044e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa59e361f1ff29f9bebec8c9294c51cdf1d7d609ad2e4834273391370a0b9f0de",
+                        "s" : "0x69d5c77bf73cf24898dcee647feedbfa80a10d4dfa52784ffa02115b7b42b264",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1103g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1103g0v0Filler.json
new file mode 100644
index 000000000..721d92a50
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1103g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1103g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61044f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x950c8e94ac944d770ddc900c6fe058176fa9d9e63720793cb354c74c7f95603b",
+                        "s" : "0x1012b7fd88671b2239f3591784a76ea29de5aa65f0465150a2c61b58e5966dc5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1104g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1104g0v0Filler.json
new file mode 100644
index 000000000..d513708d9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1104g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1104g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104506064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3a37a5d5d382d98e65150441fa6b8f3c23c704e6aed0b3fac7a83f950b9ac4dc",
+                        "s" : "0x2a73b594dd5532a35c905cca31f2d5834c53b51c5902060cf401898801b9489b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1105g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1105g0v0Filler.json
new file mode 100644
index 000000000..16e433b1e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1105g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1105g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104516064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x36e947edb1185868810afb7ea1343cb6b332bccf9d6682c9d348d1313b6a9d2f",
+                        "s" : "0x7a200923b2a15b946d407a30e0fca26970c64717964c1e672a11848628f202c2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1106g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1106g0v0Filler.json
new file mode 100644
index 000000000..1d453e339
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1106g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1106g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104526064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfd6a0f042cef86a51ca5911e5b8be056b155e0d6082c52ba80fef0b6fc04bfd5",
+                        "s" : "0x51ca0e38d429ffc12b8923d2995a25bae39b970abdde8c188116bafa78896d55",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1107g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1107g0v0Filler.json
new file mode 100644
index 000000000..7e074c467
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1107g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1107g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104536064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x586671823361bf35884d71cc43e168f6c218169a4b2b778f3db19d1059685b15",
+                        "s" : "0x0c33505e82a53e4ff0114b1f3926a292b93d18576e9e76b6ffcc56d9b8a13ae5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1108g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1108g0v0Filler.json
new file mode 100644
index 000000000..885f16828
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1108g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1108g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104546064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x90307fa3646ea8b87fa660d90daeea5b60d79bcf67ee967a632566209e50c55a",
+                        "s" : "0x0eeaf98683428477c5cc28e446bf53fabffb5ba40fdfaa97814334f27d742032",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1109g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1109g0v0Filler.json
new file mode 100644
index 000000000..079d33702
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1109g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1109g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104556064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x90165bb98fbf9f607cee335914004d1e3e161a0a9c9be753b5932a97b9e17255",
+                        "s" : "0x670d494fe3e174b74e7aa53ad5a875ce0c66cf7f5ec682f5fdd72cb6190ffba4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d110g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d110g0v0Filler.json
new file mode 100644
index 000000000..34f14cb23
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d110g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d110g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x606e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfce286e2766c0c95239743dba83b9f53df7b77d4ccdef1f055cf9412a5d7f570",
+                        "s" : "0x51eb1cf197f778fca31fcdee3d7e3ef35bdc15e512e16ebd73fcb9178963969e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1110g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1110g0v0Filler.json
new file mode 100644
index 000000000..108f234bc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1110g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1110g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104566064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x67e239f04e20bb19cde90a46ec6b777106ea533f386893d20d3377eacccead5f",
+                        "s" : "0x7011c08e4f073f50d6e755bf794d5d4717e7c7f13c1196ad9a91feb8932cd654",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1111g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1111g0v0Filler.json
new file mode 100644
index 000000000..fcca7b477
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1111g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1111g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104576064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe566d3e801b33f5984c7af9970e533b4b88f2ae3883436a686eaa86fc7a36692",
+                        "s" : "0x15b6e922ff4cbb93d47e6f53e86b0ec0946abfee83eae8f9d4d4ee72c4709947",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1112g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1112g0v0Filler.json
new file mode 100644
index 000000000..5be286784
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1112g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1112g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104586064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1149d5c708c7c0f1b417b15461ddd31d2f096f4b6b16e1a4d71a59c6395a6b47",
+                        "s" : "0x5c7938bf1bcddcd9ade2556047366bb44211351517a71587d13a8b5546130c70",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1113g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1113g0v0Filler.json
new file mode 100644
index 000000000..49a3234ac
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1113g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1113g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104596064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6c7fe96e1e621c83de664d019dd33c00b9bd076585bb43a11a2aa33b44d94ca3",
+                        "s" : "0x3a0957122a55f0df9cc5a896a132faeadd7f2504b5961ef685ff470a17360b17",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1114g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1114g0v0Filler.json
new file mode 100644
index 000000000..56dfc8453
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1114g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1114g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61045a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x88f3b69dfa1348a863f9a17a3e15e8a649a1d21b154dcdd3f76932af23975a50",
+                        "s" : "0x12dec07cced26a550c747aa651cccdb0313c7f9e9419c74d56fdae0a6664621a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1115g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1115g0v0Filler.json
new file mode 100644
index 000000000..059a05569
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1115g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1115g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61045b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9d118325087761e47cfb944fefd6dec087f26461f7ea3a15ccec24fa8985d8cd",
+                        "s" : "0x564cd0a34d03fc1fd86cb824f22beebca68864b355a696035253587133a835cd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1116g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1116g0v0Filler.json
new file mode 100644
index 000000000..fd97fcb2f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1116g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1116g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61045c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf1894568d760bb0ec1364d9a8f9233b5e7e5600d7d9994a2d2fcee95ed132765",
+                        "s" : "0x3f3a0be90764acbc9de916eb9493285d29b4ab5b10e7643ed4e6dfca22a4e96a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1117g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1117g0v0Filler.json
new file mode 100644
index 000000000..ee8a1eb7f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1117g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1117g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61045d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1bb237c3e2dfb3bd72233a466f607ef5d2fea8096da75abf63a67c9c2c05c339",
+                        "s" : "0x6c92a8fd4d21a6a9e0f7855944a63f02cfad56c2f432b649455927d6fa417e30",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1118g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1118g0v0Filler.json
new file mode 100644
index 000000000..a78b26a9c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1118g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1118g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61045e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2cbf5e943e650d7219055791276b2a7db9b25c68dc7c7ba4a00f6226005b9da9",
+                        "s" : "0x18b173da1c51ffab79ad9d7ad2dde52dc62db729cb972b42b5eb621b18246601",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1119g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1119g0v0Filler.json
new file mode 100644
index 000000000..36c551b30
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1119g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1119g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61045f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa0781700040a5370ad20d9fbf0d7f9670e27e1788639f495ecdfe3bd6756dd57",
+                        "s" : "0x16c0877a825c8f379d3079710ad5a720f90e6ce5d4d1cea18a55ee3025279a36",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d111g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d111g0v0Filler.json
new file mode 100644
index 000000000..4e694f41a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d111g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d111g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x606f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcc7d65fee01694689b4720164ad5fc3f1113166d079b325653753b1c81c68b20",
+                        "s" : "0x270b0fc84326c20ee3ddc1890e335ee192e6ed92162fb5e968e350d8e1e9dcec",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1120g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1120g0v0Filler.json
new file mode 100644
index 000000000..d1d6b21d3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1120g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1120g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104606064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x756650510a7d712a4c64a5a846d1cd34e2ce1d5d94ad9d6140d68baa3c241a72",
+                        "s" : "0x0970b45b23130cd85f792cc17d815ad3f62a492b9ce078afab6ac185b9da07c6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1121g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1121g0v0Filler.json
new file mode 100644
index 000000000..88b88d4c0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1121g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1121g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104616064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdbe7cf217c035a7dc532877eff190427ad9aa286a4e07193d1f080e9de36bca4",
+                        "s" : "0x265ef5e962bfe3726931e2987af0aca0130a502e2b38486af4528a6e69b209ce",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1122g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1122g0v0Filler.json
new file mode 100644
index 000000000..6c7c4ba92
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1122g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1122g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104626064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6c5fb0bf35543cea29980455714130599dd0fac97e17f2904c9133d14ad2ddb7",
+                        "s" : "0x50f08d2c9cd24b5a04259117febcc8dd83110a39f4128f6a507a9b8d8e3e7145",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1123g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1123g0v0Filler.json
new file mode 100644
index 000000000..a52588721
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1123g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1123g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104636064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x37df9b67a9946b88eb24dbb58e56cd9b97a9a34eb4ed442852fb00f99d1804a7",
+                        "s" : "0x2292392c65c4e032eacd5f28cba3d91e6559ee904b2ea64ffffa5b6b689728ee",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1124g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1124g0v0Filler.json
new file mode 100644
index 000000000..75b9cabe8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1124g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1124g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104646064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa8e02e478f706c0f606f7412fea1e0699c6295d65fa73a6de239311e9f5775c6",
+                        "s" : "0x3f46fedf13b7741d54dc8e395481e54b1c96d79a2a885c3a983d47bef3826f4b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1125g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1125g0v0Filler.json
new file mode 100644
index 000000000..e32f2b9ee
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1125g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1125g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104656064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd32157491fec68870a0e24d7f7799298b1acb3a0e38c8160f0a4508662ac6d15",
+                        "s" : "0x7843c5bcb6ea054cfe1fd57deef167d9383801885d32a023582c4316c687b03f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1126g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1126g0v0Filler.json
new file mode 100644
index 000000000..ba92b3476
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1126g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1126g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104666064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5d19731893960f7760f918039305dfa69c1c3ac3597307e8ce77d2a7dd8e0aa6",
+                        "s" : "0x016a361caf26ac8859bcaadb091f7fe6d695e4116fcc872bcc17aee67cd4dc51",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1127g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1127g0v0Filler.json
new file mode 100644
index 000000000..aaad5d094
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1127g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1127g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104676064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x413c7747858b6cb4d5a654c4cee668635f949e8e7e375ee9a6ff86519c89eb5a",
+                        "s" : "0x6f26993f3f3a2f158cc24724a83e4aca3f9339fd9b8ac507271232367dd81123",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1128g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1128g0v0Filler.json
new file mode 100644
index 000000000..2a78aa0df
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1128g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1128g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104686064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1e4b67e020a4d54325b0a1627db57edf45c5d94c16a863c8395587b3c27d9e9e",
+                        "s" : "0x3e0717d208d9623c683289f9791f604a4f0809a3038dcf6d460b28efa271acb3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1129g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1129g0v0Filler.json
new file mode 100644
index 000000000..6cc0d765d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1129g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1129g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104696064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe4fe383f3947fc8204488367d0be99f5424ecc7756766f79afc0a21ce531f678",
+                        "s" : "0x1cd9febd871102c48ad453efeb9b195d280cd4126a964070fa98240d1535dc61",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d112g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d112g0v0Filler.json
new file mode 100644
index 000000000..c3c55636c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d112g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d112g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60706064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa25479704ae79c9d4cde4cbbe106e03c8e506c5abb52d26ee380855b0a844bac",
+                        "s" : "0x64f25ee672a048b18afc5c28e1a4eb2271e60b6f609eb24c2ce4f32800e76446",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1130g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1130g0v0Filler.json
new file mode 100644
index 000000000..2230cd448
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1130g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1130g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61046a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1870f496ba2d227fc04227b699881d44517fc6d79776ad6c5fd6d0e109e3f788",
+                        "s" : "0x16ecb7ed9e79f8a2ab8f54255acbcc7b2f0c830b6f50b38894f155f7e66088ed",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1131g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1131g0v0Filler.json
new file mode 100644
index 000000000..e202036ae
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1131g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1131g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61046b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0934910464936e5133d085543773a7ae01887ce9b0caada9748afcd521a69973",
+                        "s" : "0x1e76d5c58349c7e54ff46bdceda5bb70b67bc47542ba000036a304761a874bd7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1132g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1132g0v0Filler.json
new file mode 100644
index 000000000..3363afd9f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1132g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1132g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61046c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0df4d022581451185f708bc9de4f244e94c9891e8ae317f2ee380c455e45bbeb",
+                        "s" : "0x4dfdf7d3f7f1e1c83666a9f15abbae37fe87f5d75c6db93240836613c979942c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1133g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1133g0v0Filler.json
new file mode 100644
index 000000000..03a8f8516
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1133g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1133g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61046d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc83cba975c17732f61f5afb3defcd2b7be3c738fbbbab6a18c19592ca6bc6961",
+                        "s" : "0x0d0579cbd88ab15d07df04c5a5131a94c3d648f3f25c9accf6ac8c65f4d1f63a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1134g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1134g0v0Filler.json
new file mode 100644
index 000000000..77ee93f69
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1134g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1134g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61046e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x36306550578a3e7765ae83b94e5ccd2bfd0e6648d72d877efc0eb5f5a42209c1",
+                        "s" : "0x741baf21844683df71e8b5da5434ae667c7d9e23675138886fba0ba47e250e88",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1135g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1135g0v0Filler.json
new file mode 100644
index 000000000..5b6c70ff1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1135g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1135g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61046f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x71d6e295feb01ba947ebcdaa56191ce53f2c1c6eb6676435c8ff54a4753f14f2",
+                        "s" : "0x44e50be5f23fd993641f66821d1f607263c2ffd0ac4bcb9ccfde7d9a6de191e1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1136g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1136g0v0Filler.json
new file mode 100644
index 000000000..eff3e467a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1136g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1136g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104706064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa9d5275bf950535823620a37adc70836042ab18415a803ee57df3c5abf031f20",
+                        "s" : "0x7aa0e8b370fa756dd47c1c1a5b83fb9aac9fc9b9dc30a25bb791cb42921b9a1a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1137g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1137g0v0Filler.json
new file mode 100644
index 000000000..3e4c1a1cb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1137g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1137g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104716064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1a84e2eff4069dfae72ba2a21ba8dc618c015e4fc3d532abc04e2483c95012f0",
+                        "s" : "0x42ac83c5f43d37d8c41c2444e18b9f3140bdcb154f48ba1164fd38fa4ef8ff16",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1138g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1138g0v0Filler.json
new file mode 100644
index 000000000..7a075f0f3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1138g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1138g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104726064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfa8f8c09790357254d55f557a9293117c9e40eb307f696f36e4260b08e6c444d",
+                        "s" : "0x0a7dad688624d928f3a56397f2184a7489648f0103a4f6e1c0363a5f03142435",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1139g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1139g0v0Filler.json
new file mode 100644
index 000000000..2ca9e7f33
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1139g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1139g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104736064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x26d06d02b9acde68dafd467fe254a3c29e91bead305e1f9da4f635e5e5fdae2e",
+                        "s" : "0x784b7b1d48816e218cdd802d0eeb6751a4907014afb5286c7ff8e448553778e9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d113g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d113g0v0Filler.json
new file mode 100644
index 000000000..70ef640c4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d113g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d113g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60716064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4a4a62a5b62ab37fbc5dfa963d16d7b4de1cdf9993576d5cee2a64112c9270e6",
+                        "s" : "0x1b6f8d674022ad87ab13640fffa1b8c28ed179e1bd04484c748c7e636def3a2f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1140g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1140g0v0Filler.json
new file mode 100644
index 000000000..6769ad8bc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1140g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1140g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104746064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf8edc76d2b80e22ab6c8618d59bba9493cd663ccbbe0fcab4f1fc5ff4332421f",
+                        "s" : "0x4a42fe1102812c266ec91cf7326dd755d9ea076b721bfc1560492fd574288692",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1141g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1141g0v0Filler.json
new file mode 100644
index 000000000..df3ebbdff
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1141g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1141g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104756064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x76e03d6b8311dab984e671b8f80b61ba3c80573f6a5bfca8fe14b743ac3bebfd",
+                        "s" : "0x0db5dd8d22532b94fd2ba3a683b77e0941ae18f6c589fce54b67e8ca0b6efb95",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1142g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1142g0v0Filler.json
new file mode 100644
index 000000000..82c3ec105
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1142g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1142g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104766064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xde8c32d6f4701848aa2a4872153e23ec5f604605d21d9d86bd9c0cebc537dbad",
+                        "s" : "0x5f81acc4aa876d54a703d66ca50ffdf670ae86b430593a64f8cb54fbcc53276d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1143g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1143g0v0Filler.json
new file mode 100644
index 000000000..5d0910f54
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1143g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1143g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104776064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x331d9b1b46d35555b80b4a7ec86e62e9a805540fd65aefb373857e56f31c4c4a",
+                        "s" : "0x414052ac748c7627ca6545dda1ae094875b571cd17df09cac647265be7abe9a1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1144g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1144g0v0Filler.json
new file mode 100644
index 000000000..9adfee650
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1144g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1144g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104786064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbb8dd03c07d7dc97c2632927c18a80114ad9d0b59a7236e4911ed5c00f51f297",
+                        "s" : "0x29d37ef64a6638a3f98f0c07ca09f8d9c26d369c1ce029392dd344ac7eb90812",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1145g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1145g0v0Filler.json
new file mode 100644
index 000000000..a3dde6a5c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1145g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1145g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104796064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe722a9ac461c2b4525098f3032d783c4045d54b8f53bab81a1c6dd721a9e57f4",
+                        "s" : "0x7ba38123fcfa285d1602eeca9f89d6e0f958f220516c3800e0b40af047e9d176",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1146g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1146g0v0Filler.json
new file mode 100644
index 000000000..d96a7d159
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1146g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1146g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61047a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x946a18a218713e249ae20876b71a14c64c32b1fa3724cddc8bf8b4a836a5958f",
+                        "s" : "0x18b0a1717c7ca4691a31dd67911a054606f8a2766e1a21f637044fc6f7894990",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1147g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1147g0v0Filler.json
new file mode 100644
index 000000000..3b0a51884
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1147g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1147g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61047b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3b47cb6013b6a965152a6bc2b5d99cfabb32fcfa8881a6954992b9fe91eb6d",
+                        "s" : "0x2e838a2daf2d79a1a90a73b916761786e885be47d197c3f8c40560b4009597a9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1148g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1148g0v0Filler.json
new file mode 100644
index 000000000..fcde34960
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1148g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1148g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61047c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa552272e475e6c68ca16adb8265f16c10623c748faeb92ef6c0cf1584bfa5df6",
+                        "s" : "0x7b77208685f22a1fc28fe133e25f8eb1c3349de2e3c600436d9290049f897b71",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1149g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1149g0v0Filler.json
new file mode 100644
index 000000000..d2d0d6edf
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1149g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1149g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61047d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8189f6a9bcdbb0380f4fc2a529e375b4b85e9863838f1736903d532dd7bbbbf6",
+                        "s" : "0x6a7bb1f482cd6977023486d161e3e9f8631f29b9306717a59f5e942b8faaf5f6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d114g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d114g0v0Filler.json
new file mode 100644
index 000000000..b35ffc835
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d114g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d114g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60726064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdc83e2707890f1b4f4a84b7be28ba4da78310df2d91d39f313143a05aebb7348",
+                        "s" : "0x2275072ddfba979f62427b28961c0507866924f2bbf1784898ecdc2a15f1f2b4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1150g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1150g0v0Filler.json
new file mode 100644
index 000000000..eb2533ad5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1150g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1150g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61047e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa76a50d2ba6daf8b4d0ebb41905f9daa8e59f461c2b310e5856acf451729f71a",
+                        "s" : "0x2f0d6342cfe561072f451d5f22f305ff7a191db241af9f23acb2efaa6030d75e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1151g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1151g0v0Filler.json
new file mode 100644
index 000000000..3d309d653
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1151g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1151g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61047f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd61b20d5122061c7fb355df0c7250fd9d5684ea098616f4d948881731c1fc147",
+                        "s" : "0x33afc02a48ba6a0e1256bfdbac8bf31409bee459624a111cb3e7da1a332b2d87",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1152g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1152g0v0Filler.json
new file mode 100644
index 000000000..5b950835a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1152g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1152g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104806064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x304d56f03179322491c18311a92fe8296f51f1763edb05fd8375dbb4d5306854",
+                        "s" : "0x57703260984190e2c97a4ed7ef6cf8b77d340202a9975690fc0b5f64dc3c481f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1153g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1153g0v0Filler.json
new file mode 100644
index 000000000..bd806dfde
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1153g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1153g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610481606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x53fa9c48251daf072e30fdfb1442be9941aaf4cdd10adc5e23172b23851e6e71",
+                        "s" : "0x4679ec4958b5dbcf58fa3b18161fe6581480514ac8e5231aa285d66a01600fde",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1154g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1154g0v0Filler.json
new file mode 100644
index 000000000..e1ca94f62
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1154g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1154g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610482606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc97ef98e550e7ad8c5e9e23736b65e1dec266e8c84ac6b3d6aaf9c7f32c4cbca",
+                        "s" : "0x3ca4ad153f139f13785890364e219138110c4188835a108bbd1c25907ffe19b1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1155g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1155g0v0Filler.json
new file mode 100644
index 000000000..30e6ef271
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1155g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1155g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610483606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0589b1bf3d7719811106262ef041acaee936678e62e5e29ffb4f23324ae8e6f7",
+                        "s" : "0x281c1f1885351b9fd7a43578c4f63576b19fa8d1dfb18c68d09151410612a6a9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1156g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1156g0v0Filler.json
new file mode 100644
index 000000000..111c77544
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1156g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1156g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610484606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa006749d9d510f2af65cd1cdcd1270b1d2cd69dfd0503430454cf7e6625b6ebc",
+                        "s" : "0x0cf1057d9b86c8e3b8022e06f2334bb564301cc97521b2ed8b16fb62a736430b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1157g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1157g0v0Filler.json
new file mode 100644
index 000000000..fc7337e8a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1157g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1157g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610485606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x862f50141d8b81b0314d5fb25b7d834865e2bf5dfb663407fdb8797aac48ae61",
+                        "s" : "0x27980fbe25a5ff9e31a186da47f8685135e32ee44c20ecf60994f1ca69b81dab",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1158g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1158g0v0Filler.json
new file mode 100644
index 000000000..33d33d977
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1158g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1158g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610486606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbfa95badc5cdf458ec1975ed1f45368f670b51859930cb5c9d5823200267c648",
+                        "s" : "0x7914d85cee3d4c7e977de02c80369bf46456926b40d824aaf6a505e210286f18",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1159g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1159g0v0Filler.json
new file mode 100644
index 000000000..4a001d616
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1159g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1159g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610487606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xba763d3d3c6d26526b716f28d5a74780ce9c77156f07331f7e6c156031f771ea",
+                        "s" : "0x71cbf31c855fd8b723f769f1b96974445de26fee307e3e9e080c128192be2f1b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d115g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d115g0v0Filler.json
new file mode 100644
index 000000000..79126c5ee
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d115g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d115g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60736064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6dd9d5d0d2330b85aa075d439ff77bee8b7ecaba2af61ac4ba52f8ea94cbe40b",
+                        "s" : "0x76934e3930fbcf6afacdec35fe50a6ca690bd6983dc59501b68ea1eb73fc6940",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1160g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1160g0v0Filler.json
new file mode 100644
index 000000000..0c3dda6c4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1160g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1160g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610488606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x56fb5af8f58289a071bfb4467aad23221858202d8cda76ea73576cddfaf18f59",
+                        "s" : "0x29a77bfdf4b09bf23006684ebfc2ef3c58997f1b1e0e63278ea37fd683fde992",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1161g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1161g0v0Filler.json
new file mode 100644
index 000000000..161f137bc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1161g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1161g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610489606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x65c42cd9e5a3d1a7b04fb3202cbd599569926ce221614edb61e4d6b775b70d3a",
+                        "s" : "0x144b7e99569a98285b7118a843f5e6cad60485f9a17fc6e4995175364f84aa59",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1162g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1162g0v0Filler.json
new file mode 100644
index 000000000..66c7c153d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1162g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1162g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61048a606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x50a3518093fa2680a97a47e3ffdbe560a9088a2610b45928655f36cfc188de20",
+                        "s" : "0x4fe8946f1f239ea286519ababe6abd48acbe50ac6d446b08a0aead252ced852d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1163g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1163g0v0Filler.json
new file mode 100644
index 000000000..dc10001b3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1163g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1163g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61048b606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa52d4a9a6e58f02e19403683ea9b35661a3a899e7fa4d3a5cff35e4bb62432bb",
+                        "s" : "0x2eaea625f976465a79e13730d309bb3e87d9198d8d70c7b4ee81cb0fdcde6fed",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1164g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1164g0v0Filler.json
new file mode 100644
index 000000000..74675429a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1164g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1164g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61048c606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa73b9b5de8a65e097974b04566cc587b7eef5db613dfd9b93cd7572450892349",
+                        "s" : "0x51fc70bbf23429f1b28380e5aef52f87ac5ba9492f2570a647f1980ebf97b5d9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1165g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1165g0v0Filler.json
new file mode 100644
index 000000000..741d1da60
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1165g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1165g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61048d606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3697e97ace1757f22647cb8304b5279d4f8fc3250c36265f92a98ab1a06656e4",
+                        "s" : "0x0e7221aefda101aae16532a6edaf1f8a5ae2b90d0093c2a8512d32f17251875b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1166g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1166g0v0Filler.json
new file mode 100644
index 000000000..f1dffdf9a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1166g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1166g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61048e606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8e6d1a0eeb64b261d1c0ccd24a75d29abe607d365c44e74e64d1ece8e01be9af",
+                        "s" : "0x670992064fbd0425e7c8ef9cec4fa3b51089181cab3e4276bf1af4109af743bc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1167g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1167g0v0Filler.json
new file mode 100644
index 000000000..4346d1a62
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1167g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1167g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61048f606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0ee04101418b8bdd1ebfa2f3cfdd653ac2db7514571cc890cdb67a7c9c15fd59",
+                        "s" : "0x325b6ef404af9ee460348eb614a1efddbde9ae87164bdeb8b598552bd553aa37",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1168g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1168g0v0Filler.json
new file mode 100644
index 000000000..06923c75e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1168g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1168g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610490606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc5cd0f1f4f31f890f7a7794dd1fe4819e941aca8132044608ca38fc582c6381b",
+                        "s" : "0x5b3cd5ff42c78a5346efb3833001c1a3c60cfdc0f592df7f412b48ebcd404da4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1169g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1169g0v0Filler.json
new file mode 100644
index 000000000..d48abd83a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1169g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1169g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610491606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe03cf8df99c5ea60863211463fab0f8a2a48910b9687f4ee7c8cea4fecf6455c",
+                        "s" : "0x59ab4df82af7e3ff48710f9d1513ad6dbed41034d86e7a456bdda0a3be2cea31",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d116g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d116g0v0Filler.json
new file mode 100644
index 000000000..db8dda9a0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d116g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d116g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60746064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4852dc5e11b91d2df7d57aea4148d36603f1c829e9f7d7860c5f2a4f80beaa56",
+                        "s" : "0x245d22bb70b115b50352eae845ad83b92cdd110e3762bdf0d687a822b2fd645f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1170g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1170g0v0Filler.json
new file mode 100644
index 000000000..73d29f01a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1170g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1170g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610492606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe7cdeb22e40df8b64fdfdb3c34f0b28eb2f07f27047eee8fe78dc4e2edbf6651",
+                        "s" : "0x3aaaf149c3273867dc2994a3a777b10748c195d087c986596a3f112f6bb3f190",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1171g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1171g0v0Filler.json
new file mode 100644
index 000000000..868cebf21
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1171g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1171g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610493606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x04f4e129eaebcef98742363170e644afdf339c6741eec27e7058eb0b8411fc13",
+                        "s" : "0x1bc99b770f46ed2857a94e451c5bda8dbf492d93777676e48acd68763e641641",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1172g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1172g0v0Filler.json
new file mode 100644
index 000000000..28bb74234
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1172g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1172g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610494606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2daffc18f3de7b020be35dcf4a442f513ef5290672fbb7d3c695224637ace39a",
+                        "s" : "0x219905824a8e6b05c20a31d110a6b271de27be292a99df2d6f4fb7f44897411a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1173g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1173g0v0Filler.json
new file mode 100644
index 000000000..25a51fd20
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1173g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1173g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610495606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb09f7b579ad8d7d878be2210051b3befd8695c2f1e63c086fe8c4dcde0f69888",
+                        "s" : "0x528fb09faae20ba879ce4fcf210bb251d3a6276d57bc5251f99880b695e09340",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1174g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1174g0v0Filler.json
new file mode 100644
index 000000000..009950bdd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1174g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1174g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610496606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb6bf308b76aaa54d568b8da9f6dcb0a484afb215cf4d018aed625aafbde7e957",
+                        "s" : "0x3cd456862574aa97860acac398c03d49b7d2906c29328e6d8f151f1c6bdcbdea",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1175g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1175g0v0Filler.json
new file mode 100644
index 000000000..c048162ba
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1175g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1175g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610497606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xac01ca26c2113314304b8d7ae385db4c6acb9e475a0a4aaff458a09c3840fb1f",
+                        "s" : "0x560532c52c3d407176d34abb1c6846f556461b4fa4eb010a56401b9744c9dd2d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1176g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1176g0v0Filler.json
new file mode 100644
index 000000000..72479b36d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1176g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1176g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610498606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x51501da098843df2104088cff966d999ff5d9516b9bfc7c8215fc3f16fe09b6a",
+                        "s" : "0x6137f765f5a9122b47ec216049dc8dd40a9046223c33d96afa01d29aacc28127",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1177g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1177g0v0Filler.json
new file mode 100644
index 000000000..a1cb49172
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1177g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1177g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610499606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc0f28de8f7f852f78aa6dc00cf10c2c7f1c20d6da663dc5abce66b6f72d4e5e2",
+                        "s" : "0x7ad7f92ba53c7c3cc8ed2b6d829319699735391046059b7d2973ba142b1b7e0c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1178g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1178g0v0Filler.json
new file mode 100644
index 000000000..25c26169f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1178g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1178g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61049a606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb74866de753a0e6b07cc982378d039ed6f524f39b732091410b71811b108934e",
+                        "s" : "0x1b3a07212bcf442f8961cbe1bfeb79e2db190572c75e541758e1630a8b0970e4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1179g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1179g0v0Filler.json
new file mode 100644
index 000000000..07b92dbfb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1179g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1179g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61049b606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc6c461cd9f6dedf605577f24b6996e1e78d66afc4dd2778f05d6277d0b4dce1d",
+                        "s" : "0x2468cc278d87ad1f8bef8eb4df852de69ab9001c1792d4184316d31006951fc3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d117g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d117g0v0Filler.json
new file mode 100644
index 000000000..babe4d03b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d117g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d117g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60756064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x88d2f292081ff928c893e4a7c34aabd4b4f871673115e72e1b1de63bc37dff43",
+                        "s" : "0x2f3b014f3242057fca561c9885c220014940d24cd1ef1772735644ab00754a80",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1180g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1180g0v0Filler.json
new file mode 100644
index 000000000..65307891e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1180g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1180g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61049c606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4e4ea0a43c159f4df6c26eb9d0e68dd78dd6e207afbc4f23051019da09e8510c",
+                        "s" : "0x16a386aea0ab2491fcfe3bc1df43131e2ba3be2ea13b2d0e427dc602a974caec",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1181g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1181g0v0Filler.json
new file mode 100644
index 000000000..4ec17f252
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1181g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1181g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61049d606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe977978b2d3f1feceb07146c03af6fc786419d781ac6611483ac4d6480e4f6ef",
+                        "s" : "0x70125b8da7670cefeba91e3f68a3ebfc8ada3a942c7d1b79d29d7623b8e8d055",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1182g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1182g0v0Filler.json
new file mode 100644
index 000000000..a1276b9ef
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1182g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1182g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61049e606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x278a91602c512fb52388e483d186344e63c4020d13a4d07f2c0a23689067d6e3",
+                        "s" : "0x6dbde9444eb8a25a63425c2107c7b6de6029589f7de9f7788cf6f5621db03a5e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1183g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1183g0v0Filler.json
new file mode 100644
index 000000000..377f6dfa3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1183g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1183g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61049f606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x71e9bab6c5684d91bcabea130c388b571289363433b37db003905421e674f565",
+                        "s" : "0x5323b13d949f1bc23a3ad73c5df660ed534cef306dd2a7ad8bd0da95a2c26c0d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1184g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1184g0v0Filler.json
new file mode 100644
index 000000000..c5df2b4f8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1184g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1184g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104a0606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x85c6eb8ffeda2201a7f295e8204f75dd56cdd10dd1a56d8928464ce1c5ee3efb",
+                        "s" : "0x5f4fa402ec642ec014c0bd0d8c36bf9ff382b171514cb1f83aed1346ddf78017",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1185g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1185g0v0Filler.json
new file mode 100644
index 000000000..b75e79678
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1185g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1185g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104a1606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0197a950006ce9f40e9973a33df281bb925f6a07977663b3cee340c87b64585b",
+                        "s" : "0x08dafba8570d1aa4ef64c1fb6f8354556064c466c80c81eac0d023a8ee5b3203",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1186g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1186g0v0Filler.json
new file mode 100644
index 000000000..e15ca3056
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1186g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1186g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104a2606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaae2585f4b61871fb1392bce716ee9462c389b55478f5a6ea7f40d1001e26e92",
+                        "s" : "0x2ecef583942e563bd014f7769dd949c64dd162346829b5d15d3c72fa7febc6f2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1187g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1187g0v0Filler.json
new file mode 100644
index 000000000..6f42b7752
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1187g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1187g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104a3606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2ee14ae0fa912d6027d01c4661d27c4cc2db52f62a9ffeeeb9d41e2a6fdd1502",
+                        "s" : "0x613981b40646159c4adb30c02a5d6b093aeacb1cfa5ffcdeb308f3ee435ff705",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1188g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1188g0v0Filler.json
new file mode 100644
index 000000000..d33e0ca20
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1188g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1188g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104a4606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1147cc2f12f2022d6fc7b01e9154995ce19e861b801e56fefd7060bff92ef05d",
+                        "s" : "0x5c2c58f0b232000343cbfe4d20d5ba685b9393b27ee2a6e4a5ca812c407fc539",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1189g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1189g0v0Filler.json
new file mode 100644
index 000000000..5c51d3c29
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1189g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1189g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104a5606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0c116fb53dce11df35522bc82f41cfa5330051af679c1e398ae253718a62a14a",
+                        "s" : "0x0e149bf9fed4786f913c8e3af4c503bd2863a84565cf0bb6c1ba29c099b85a8a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d118g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d118g0v0Filler.json
new file mode 100644
index 000000000..ad5a34bfb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d118g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d118g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60766064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5d1e2467d44ef4be1441b83c10e2b9cb352a92ec0c6641a8c29972c4bdd5c8a4",
+                        "s" : "0x09a51c25462f9bb7c5cd8afc4456d7a955d66a18f3cc35604c406c66694bfb75",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1190g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1190g0v0Filler.json
new file mode 100644
index 000000000..73b3d5bba
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1190g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1190g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104a6606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2befecb493b12747492f229b4964bdb44de613bda12c5170474c0c68056c2df5",
+                        "s" : "0x6b6433ab6d1f798b00f05efbe47e34af0a830fb1a2594549c7f849b0e919ec75",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1191g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1191g0v0Filler.json
new file mode 100644
index 000000000..9a9032cb9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1191g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1191g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104a7606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x24b30b13db8bc308f26832fe15c46cf676ea756c716e64a4a7af8ded1868aad6",
+                        "s" : "0x642b6771bb1df448a55bc5b050eb745f2d54e8314d4dcbb80e6532e71cfecfb7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1192g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1192g0v0Filler.json
new file mode 100644
index 000000000..094f192cf
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1192g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1192g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104a8606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7d9a2ecb4e9f2e5c07d318928f8d3c7de945ef462d2d657cc65f9d5ee64a6ba7",
+                        "s" : "0x600e6c4f5b7ffb2af733016419c41f712dc22f2b174d47a62987104f26a2ad4d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1193g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1193g0v0Filler.json
new file mode 100644
index 000000000..b91311681
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1193g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1193g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104a9606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x500a8a8c304be17678ab884ae2d89d314077f057c19c56375282a15b473d8e66",
+                        "s" : "0x0fd0c939345f0a581138d87d57d82d6a5dfa06f90f7cbee1291f11d69e659a34",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1194g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1194g0v0Filler.json
new file mode 100644
index 000000000..140e4333a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1194g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1194g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104aa606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x94c5def4e6196484938fdeded6367b89c7c20f05699a9d7b292ad898f6ba47e1",
+                        "s" : "0x58a2c46a5b9016e0c96fcbb6580e29f1061133ae18cd7a989e39334caa442aca",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1195g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1195g0v0Filler.json
new file mode 100644
index 000000000..56438329a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1195g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1195g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ab606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa919c1558827ff54654f0aa5f16e9411b9fd572d9164d68282111f9a412965c5",
+                        "s" : "0x57ac8d0938ee6374f6cbb0c25515996f44caf88c4daf70cf50b778c51a2ed4a4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1196g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1196g0v0Filler.json
new file mode 100644
index 000000000..2645bd96d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1196g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1196g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ac606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd54a4ee217a5bf212a62ff6b8ae64b794882391dbd01fccde9cf309b90d6b37f",
+                        "s" : "0x149d87f7070a765d605d9691e5592a6d43839c7bc57591cbda8e3c32e0af3718",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1197g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1197g0v0Filler.json
new file mode 100644
index 000000000..04fbf7eee
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1197g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1197g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ad606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x93b3e13cc2645206b2163923ea8090890a91a81e4a2807803abc4d3375b8f746",
+                        "s" : "0x42e2d2d198661b19d7639cb0cd949069ec81d218f5596a73b547753caf3403c2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1198g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1198g0v0Filler.json
new file mode 100644
index 000000000..b524542ca
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1198g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1198g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ae606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4f93d89f502cbaab8a8678fd4c4fb74b15fcefbe0b3d2dbcc737cfc7cc59e522",
+                        "s" : "0x71bcd2a44b1e3448bed148f0256bbbbd491dd8c6fb8bce53117e888bac789cb6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1199g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1199g0v0Filler.json
new file mode 100644
index 000000000..b20c146e8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1199g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1199g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104af606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x62f24959d4349bac4ab29b12c97cdb9e5793728f6958e35f33e1f37339a0b237",
+                        "s" : "0x5f2783b454a96ab2c317c33ce17392a67bbe26c44bfad2a9d516d3a1b9aa6c71",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d119g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d119g0v0Filler.json
new file mode 100644
index 000000000..e93b1fa40
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d119g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d119g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60776064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc455fe1558c8b599731b16d7ab5af17e603199c2d216cc31a2be7f8fe8cfecbd",
+                        "s" : "0x14425c7430eb42b313c6aeea09a39473bc92368f5296a1c2c74a031870a3e7a4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d11g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d11g0v0Filler.json
new file mode 100644
index 000000000..aa4fa9cc2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d11g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d11g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x600b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd9c30eb48d65dbd3203750e18e884d690218c068228cf5d5738f5602e77db47c",
+                        "s" : "0x36ae57de69a312435169534b11a6dbbe42a30143370807a3fcb803ae6a62782c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1200g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1200g0v0Filler.json
new file mode 100644
index 000000000..23bf3ce46
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1200g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1200g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104b0606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x01363b94e49e6a1001bfeee5b22493d638714dc5a24931a554f78e36cea2b59c",
+                        "s" : "0x689b947351c3e8cbb100935d761b4c7c2f128f06169c38f5288f6a3205b4aaaa",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1201g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1201g0v0Filler.json
new file mode 100644
index 000000000..1918e4b92
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1201g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1201g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104b1606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcf42b139b0bfc02f8c9d939678394ced27be2f1760285057d9ef591c2ef60232",
+                        "s" : "0x3a3f2e7bfb8147102a1d21ce457ba90fe90d5621debf18b3fb140ccac3ff2484",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1202g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1202g0v0Filler.json
new file mode 100644
index 000000000..cd7b4a4ff
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1202g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1202g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104b2606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf48bc9624a9ac26b835e99ad8313bd5ba9eb2e31b961a75c6078ddcc3f46e5af",
+                        "s" : "0x4c3a1963ca5c8ce3f271afb144f22474131c30f7bf1b7eb9883931f5624ed6bd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1203g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1203g0v0Filler.json
new file mode 100644
index 000000000..e90735acb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1203g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1203g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104b3606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcb2aae1f0feb682e57056cdbd4158b87a1cd9ad0628f5b02c754a421c2286b77",
+                        "s" : "0x190f99f5acff9ebac31e953f2995a176b4f13d539f0835181e616385cdb5c0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1204g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1204g0v0Filler.json
new file mode 100644
index 000000000..f1b4c11ac
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1204g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1204g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104b4606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x151fa90e2435919db9506a7b2bf46de18926d4a7e788a484a81bfbdf4891ff02",
+                        "s" : "0x6b338b37017770a8f34758f071b0bba0e6e43222439d5ccb67c9554cb78b8659",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1205g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1205g0v0Filler.json
new file mode 100644
index 000000000..3dd876e50
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1205g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1205g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104b5606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa98f29f01f5f02084672593031cfae68d5beb7691e7aeb69977212debc832900",
+                        "s" : "0x295d465a5e547c606e51bd206279e4ac0bed3b0590bdb3cdd1f69653741b59d6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1206g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1206g0v0Filler.json
new file mode 100644
index 000000000..1eecd700b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1206g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1206g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104b6606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x92b5bb570c436d92d6d2cadcffc3e4ffc95058c45c23cfaae69d3cd08512f487",
+                        "s" : "0x45da6ac5622d905149942c8dd232785b52ab6f1db794d563c2bd2ded0026d4e0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1207g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1207g0v0Filler.json
new file mode 100644
index 000000000..932ac9d6a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1207g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1207g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104b7606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x79dc8126bc6b0d7ae360b813be9e98ddef105dce4b6ee7ecc8565e5988d1758e",
+                        "s" : "0x6d1bbc760624d42fe59aecd90a83c1aaf4785e0f4ae1d67bfa973b4d59b6399e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1208g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1208g0v0Filler.json
new file mode 100644
index 000000000..d92c574fa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1208g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1208g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104b8606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x54a2c09c829bbd39cc5b904f1c2778156bcf5a54c8462c874484e817135ac579",
+                        "s" : "0x395092e93e97b19ccbf4776f42119785f2512b069228d8647bad25b13ca0e0ae",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1209g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1209g0v0Filler.json
new file mode 100644
index 000000000..06093728e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1209g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1209g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104b9606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd44c0e12d0e4b92a05f7a76a7175faf453a3ba9fd8e58506d5e6f9c057871d3a",
+                        "s" : "0x257cc6e3a4025e05b21a7298d8055a2c2bee7502433407581b3cccbc0408f867",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d120g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d120g0v0Filler.json
new file mode 100644
index 000000000..d844c1df6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d120g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d120g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60786064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x44bdb9f4d5a415030705d1d7ce593884ac4a03a6469f3b4c7d7cf6798b17d65a",
+                        "s" : "0x4debefdd92fe0dca5c4c0c1670edd270e4647968064a80457b5048383591f21e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1210g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1210g0v0Filler.json
new file mode 100644
index 000000000..0abfdabb7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1210g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1210g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ba606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1237cfe3cbb277f2de0302199983179902e50370e6411dff553a33dac86fc5",
+                        "s" : "0x7b705c14a0d52b7ac012ea60eb6b2f38340882058ba7ce8a373c44af3de7d941",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1211g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1211g0v0Filler.json
new file mode 100644
index 000000000..bbd092aa4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1211g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1211g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104bb606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0e300198a815014bf4a45f77bac45ecf475165eb2f0c03202366cbcd2ac7c301",
+                        "s" : "0x0270d103d178887764a3de54695162a3c579abce0d3ed171afed59e57336d126",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1212g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1212g0v0Filler.json
new file mode 100644
index 000000000..65a08349a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1212g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1212g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104bc606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x59a595b2a47ffd85dee3775b586bad6f2f462b4856b4a54c34b146597e620220",
+                        "s" : "0x1d485eaed0e8514348698b889aae53b0a948f5de66c12bcb3e12e901888057a4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1213g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1213g0v0Filler.json
new file mode 100644
index 000000000..7bc10741c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1213g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1213g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104bd606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0eea47dd14211257ac7456f5ec6c39c73102c6df522503b47638c3733c3db90a",
+                        "s" : "0x576b5d44ba69166f143121ff090d1d6ebe40f2ac9ffc6b9bb8623d2778899653",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1214g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1214g0v0Filler.json
new file mode 100644
index 000000000..948195be1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1214g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1214g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104be606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x159da3a79dd6301674520d03749eb698f3492e6e25ec830c9edc7b848c4aa60a",
+                        "s" : "0x6e51d273ad3fd528b28ee4c8d7f56eb13131cbb51e05c64905d2af6f7c52c2f9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1215g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1215g0v0Filler.json
new file mode 100644
index 000000000..3f8ad2e23
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1215g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1215g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104bf606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7c24c76e686166e3a4b535a35b9fd12e8fe989e20b2143d0d551d994c4fb6ccf",
+                        "s" : "0x6b16c23580ca94b34f0f9b22b039f0ff96af5fde25b79b2d6c2059f30fc5acf5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1216g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1216g0v0Filler.json
new file mode 100644
index 000000000..5a5905306
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1216g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1216g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104c0606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd37fcaf395f6590a985fde1414d5d48041b56a290c8309441142ce2eda812ee5",
+                        "s" : "0x18e15d495b63d7d898fa6b5180b5e211813bcd705f659e542c95ae769d3d236c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1217g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1217g0v0Filler.json
new file mode 100644
index 000000000..b20ddc7bc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1217g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1217g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104c1606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0a464f5fb162d654d674e3e13676bba2e018d21dfeb1a78532ff072560d88594",
+                        "s" : "0x0a562da3cc4b7c7e91b28cb492ad10305cce04233f1ff8d078fffa491a43602e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1218g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1218g0v0Filler.json
new file mode 100644
index 000000000..3048b572f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1218g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1218g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104c2606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x20239f6f53141fd7780d61755da69c68b383af6bf54eff696fa62b26cf91cc66",
+                        "s" : "0x5b34090dc46ff999c78cefdc73b53afabb0bd3d2dd27ea0d399448f1d294b7c9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1219g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1219g0v0Filler.json
new file mode 100644
index 000000000..5093663a2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1219g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1219g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104c3606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc92bb61e8346406bd9777e8ca8db29a793af3cbc8e2eb46832fbbbe3dfff6153",
+                        "s" : "0x4b973f3877f963fe9c48d58c37b39648d6111669e450047606d376d588e54dab",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d121g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d121g0v0Filler.json
new file mode 100644
index 000000000..4a3c079eb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d121g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d121g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60796064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa8f12fed60dc4ff3b0b1905d90d1ec39ec03128ae20cd32e75c7d048fcb2b70b",
+                        "s" : "0x385402df06eedd5e78d97ba2b797744809badc8cad31b58fca12b4d6d1696afd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1220g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1220g0v0Filler.json
new file mode 100644
index 000000000..87a1eb09d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1220g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1220g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104c4606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe134b7d22fcdb2666ee2665d8b9ba76443dac795078ecb640e2684cd93bad417",
+                        "s" : "0x607fa4c087a3c6acd3455a64e87b6f85151b21a3254c252737bde39afc7ea4c6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1221g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1221g0v0Filler.json
new file mode 100644
index 000000000..43a1f887b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1221g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1221g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104c5606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7fd66704ab4e3ab1956b3b481352a5ce32cae9f821189bb04bfec82d93dee235",
+                        "s" : "0x1c3f14ac9c84ffc46b7e02cc89f471e482dac549f3b14d1d5e4bb2a91b11e2ba",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1222g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1222g0v0Filler.json
new file mode 100644
index 000000000..c037234f4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1222g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1222g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104c6606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeae508cacdde5efe057d0974d5df19fe07aae460f3daff27a7f8ec48a86d1e68",
+                        "s" : "0x76ba4fc846d3902ab83f1f5d68b785a2f4af042fb535d3bbd58a5fb1169847d6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1223g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1223g0v0Filler.json
new file mode 100644
index 000000000..8249ba387
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1223g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1223g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104c7606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x96f92eb1fb956227f0d7b0773598ff0ae944453f9993aaa83bb8907fdbf4a65b",
+                        "s" : "0x67c76d847654a2d4ae5cec6b427919a319b81f3dcab3a6e184c8c9b46533c0b9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1224g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1224g0v0Filler.json
new file mode 100644
index 000000000..302de8a1a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1224g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1224g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104c8606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3408788a45ba0b21fe2bc5938fc136877d3ace2e1bad74b30c2e167edb3b1fe3",
+                        "s" : "0x602445b4fb3a2809802dfbf7e6e5e9434c3750ac87c489e8d392cceb222be0fb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1225g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1225g0v0Filler.json
new file mode 100644
index 000000000..f216e4202
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1225g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1225g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104c9606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2cabc8459c31214c804a57fad484d86753f63723eef9002df4d033cc8aede9fa",
+                        "s" : "0x42c41332777bc67c33002b9a00fa176a4da499d01c5d300c542484a6526db550",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1226g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1226g0v0Filler.json
new file mode 100644
index 000000000..a70a0bf8b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1226g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1226g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ca606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3150ac2dcb2428f06258642792bd8b44c6c1b48b60d833217160cd35609606c8",
+                        "s" : "0x54184ce2f6ee12fa1dd662a9226a8d9c51f7e090d577980b45f09d2ccdd2626a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1227g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1227g0v0Filler.json
new file mode 100644
index 000000000..2b1477af3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1227g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1227g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104cb606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xef7525e3171b93e268ea1b5e4c199999f2bbae9cb550e77ed6d4b9f83174bd27",
+                        "s" : "0x68db7c679393f46649f42f0a82ee37124a62873d8e018aa407071246f0ee2b10",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1228g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1228g0v0Filler.json
new file mode 100644
index 000000000..f1e12830c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1228g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1228g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104cc606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x59d6ed03bed277af12768a14d748798ee440595cbc56407280f70bf5d0d1de43",
+                        "s" : "0x1afa5cdc156739b112d94832aca0855e87197da0d49c858e87f9bd77c0f0389d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1229g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1229g0v0Filler.json
new file mode 100644
index 000000000..7557a1e57
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1229g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1229g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104cd606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa5ae089ba9abd0fb600187275a071f21e561d9c7f2da2f49b358e9b94f14440e",
+                        "s" : "0x3cdc3b807d11a0e8ad2dd8077b669637ffd1b5d8b38808ee4a59a91b45fae225",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d122g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d122g0v0Filler.json
new file mode 100644
index 000000000..391dcfbe1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d122g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d122g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x607a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9d46c4fe8e5b462142c1e04a3e966155a9c6bb478601fe377ddfbb17d20ac17c",
+                        "s" : "0x62cf25be9b108c06bb0370ce9a11559c897aa5b291f8e4922a10f775c031c0b3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1230g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1230g0v0Filler.json
new file mode 100644
index 000000000..cd7d2565f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1230g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1230g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ce606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcb365deda362d5b99b530f2b50afd4991fea6b9dfb2270577677e2bd35c7c052",
+                        "s" : "0x07cadf6507a552c6caf7ba4b769fa37ba5b26bcf782c72a984fb7a775d81394d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1231g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1231g0v0Filler.json
new file mode 100644
index 000000000..b4b46213b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1231g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1231g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104cf606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf38be5d680091be8952c22f8913702c1a786b0d0c6c7a482b1a5b68f67584265",
+                        "s" : "0x220552c7d3dd6e62e17f54e6171207d033cfec1516819cf5b5eed0cd2a12e019",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1232g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1232g0v0Filler.json
new file mode 100644
index 000000000..2eebb1bdd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1232g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1232g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104d0606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0e165976573da91fb692301d03bba166f65da545a1c6cf6be4e1ca7f9dc68989",
+                        "s" : "0x47d568cd910b623c9e752015aa9cdb25dd01be7863dfc3dca2f5104b1020f34a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1233g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1233g0v0Filler.json
new file mode 100644
index 000000000..ebca1d87b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1233g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1233g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104d1606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2af2eb0ba0bc42b440a6fe2cd97d1a7d77938c1e4ba878f466eb24c0819a7c3f",
+                        "s" : "0x059800f3a0f0aa28c018875383c9604f1a76f66cdedcffdd0e36bc39e5685430",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1234g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1234g0v0Filler.json
new file mode 100644
index 000000000..70b6f2223
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1234g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1234g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104d2606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5315831e098966a715a863974d64ee86d859ef154245ee5976f00a2121bbdf83",
+                        "s" : "0x3459128548b507bcbce149fda41f6667d1ff764848c77bdb003f90e3be4c81ef",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1235g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1235g0v0Filler.json
new file mode 100644
index 000000000..ffb769f11
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1235g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1235g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104d3606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc1b7982f7f0242216e24f998583a654f4c051b4dd97cd20e05684d33b888801d",
+                        "s" : "0x5be308de8aa9d5fd26a468ab39b9f26c1e1f1e399adf12d4bebb2de9ad00ab70",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1236g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1236g0v0Filler.json
new file mode 100644
index 000000000..f1a6c851a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1236g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1236g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104d4606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xadc0a0a5b364db723c0e37130e24b1d794c534446b6e6fe422bd9fa828fa8570",
+                        "s" : "0x2584b4982709baf00dc84aa4a4dccf27338c9e6dde6577c6547608d5aae2ea12",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1237g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1237g0v0Filler.json
new file mode 100644
index 000000000..2ad4abd08
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1237g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1237g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104d5606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb977be944b3747ee0d5f0afd1bd47a29e6d279f39cdb13143145a4a4c0a86fd2",
+                        "s" : "0x194863bf8b0f572eea63ffefadd9b6eae4b8c91aa0a8727723c584da643d9589",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1238g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1238g0v0Filler.json
new file mode 100644
index 000000000..3a01b16f6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1238g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1238g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104d6606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5c2f12faa01e754b7c841795ae53ecbcb6c334b894becf8967a6bd8efa631328",
+                        "s" : "0x027bfdb3f2fca82400773a48ffc3d830066e78ff2dc10a06bdb5bf8b66cc7d7e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1239g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1239g0v0Filler.json
new file mode 100644
index 000000000..bb6329fa7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1239g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1239g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104d7606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6929d851e430d0680b9c22e600fbdc1b59f8a406f0b08d5f3dccf950fc92d095",
+                        "s" : "0x75a75f885ec2a916e54acc411b4c52bf042d53df26309a3acb215f85a0c619e1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d123g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d123g0v0Filler.json
new file mode 100644
index 000000000..0d647564c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d123g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d123g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x607b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x41280bbe9a027c84df807d7bc78c8163be2090dfefe6f1215c307f08aae77156",
+                        "s" : "0x7ffc0904bd1312f9cd8f882469ace7648503c91d3856a1da0f6064b0f7bbc149",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1240g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1240g0v0Filler.json
new file mode 100644
index 000000000..0fa156f17
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1240g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1240g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104d8606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x52dec89d53624f78a1eb198eea1150adc651762c8413d71a7eecb583ec723749",
+                        "s" : "0x7b8044d94ae3e654f4aa8b042e8e29fb570a1df30cc036712f8c7e3fb8cbe76e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1241g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1241g0v0Filler.json
new file mode 100644
index 000000000..af00c9bfd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1241g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1241g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104d9606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x158bc3341823b006134084bb381812a3bf132022657203b77e5db6f0c79b766f",
+                        "s" : "0x4ffcfc7ebddbf2ddc5a6eb0bca0b7352fa231a37d7d74a1f5df033aa21c0cbae",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1242g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1242g0v0Filler.json
new file mode 100644
index 000000000..366741f55
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1242g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1242g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104da606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcfe737ec0e2d1a85099ec6990c047b932b49d990496765679984070034a3b3df",
+                        "s" : "0x735cf1bf79a24ac39352928bbaa53ec186d4f9c8a447435ec93b05d6a8a7f282",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1243g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1243g0v0Filler.json
new file mode 100644
index 000000000..c8d726813
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1243g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1243g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104db606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7588659de1bada7d4f5aca92f00eb236a52c7c96b5a27f50d5a175c530e8997f",
+                        "s" : "0x01fa40454d64d41218a86e30e6f8f2297cc25f44f6197898cd5cc69b6f38a9b5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1244g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1244g0v0Filler.json
new file mode 100644
index 000000000..ea52385ad
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1244g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1244g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104dc606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x06a8e782bf128fc4d49df5ee0a46ed3be88e83668f1606bc4c52160d8554ae68",
+                        "s" : "0x1886338539796b2cb2ac9a8b6a6d31de26578858bcdf9a84ef1b389b36d9628e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1245g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1245g0v0Filler.json
new file mode 100644
index 000000000..adbc15232
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1245g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1245g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104dd606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x97660d58e88954f8f837bd52f8d86ce7a1ec1bff99b857db652ed73c9552b4d0",
+                        "s" : "0x7583ba3577428f604e56b7ccff2f5d71dd3bbd53f5d918717a0b35d1e74a1f61",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1246g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1246g0v0Filler.json
new file mode 100644
index 000000000..22a529a75
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1246g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1246g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104de606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x10978158be2f428fd90f509d574037ca2188f6adb40bb695510583afe0bf18e8",
+                        "s" : "0x6ac8656b9becdd9738441982a8ec5c718d3778fe43d3b11ddd998dcbfbcdaa4b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1247g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1247g0v0Filler.json
new file mode 100644
index 000000000..5acafb353
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1247g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1247g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104df606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xabcf598dd32655f5d0dade58fd4ff98739d436468c1c10dc41901f6a26aa8c14",
+                        "s" : "0x26a4f970084f3d14b0ebb80c40551a2ad99bb3f81b0723a027dd9b742bc4e977",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1248g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1248g0v0Filler.json
new file mode 100644
index 000000000..adf599d97
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1248g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1248g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104e0606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd7b9fcb928874dc4a5837fd6807b75d87a13c532f412b11aaf2aa8e14ff7d18b",
+                        "s" : "0x2ee3ea8ae8adb28e612d68020d9c3c49b301b8532640cf10beb7482b7e1e9c4a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1249g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1249g0v0Filler.json
new file mode 100644
index 000000000..c2796e852
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1249g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1249g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104e1606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5db0f1e371b9518bcdeeef3a324743149fa3147dcfd3f39ade3f6835c520bf22",
+                        "s" : "0x5b95151bb87285a0187681b161b0ef3cd16c9f58238aaaae083cf188c89d2f28",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d124g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d124g0v0Filler.json
new file mode 100644
index 000000000..3eafe9ea3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d124g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d124g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x607c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4e451b1e609b5d94f217d5468f883c23ab7b4098190471add049bd750cdc3f11",
+                        "s" : "0x0f2333f188d35f29b0a15b81d536f8c8aa9fa1ba5205babb2507b9bff7fd1815",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1250g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1250g0v0Filler.json
new file mode 100644
index 000000000..81ea16b6a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1250g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1250g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104e2606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x94118dec5d3369f7cc9e18396ea00b9b82ea1c51c9c19507d36a5330b98e815b",
+                        "s" : "0x07ec34922ed324d0b23fbb03d9a0238e24f9fae134124717171e3428a45a7418",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1251g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1251g0v0Filler.json
new file mode 100644
index 000000000..19a6c5f67
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1251g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1251g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104e3606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x789a5121b1d642aca7d08c2cc3149b5bfe3ae7661e13b660712f31954e50f798",
+                        "s" : "0x18a65835bb6b31765c058fa3477ea3f3da06806265b8e38914ebd1dd9ee98af5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1252g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1252g0v0Filler.json
new file mode 100644
index 000000000..3b4e2ae40
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1252g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1252g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104e4606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9ef61daf2159ca30ee51bbb7a4e29f2d3792058157f91329e84fff226a42d281",
+                        "s" : "0x0df0e7dea5c780fb03f2d70b7eb7b2fb5d4f63604fa186869cec769b175c1783",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1253g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1253g0v0Filler.json
new file mode 100644
index 000000000..571445648
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1253g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1253g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104e5606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7a2286d195107263a2ab2842c8460d407bde81779ef6b23cfa7adf64a4ddf2e3",
+                        "s" : "0x47bb794153435ba94f41f971f6c5f8981f768356581cf49a6a57faa01106789c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1254g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1254g0v0Filler.json
new file mode 100644
index 000000000..2ea17448a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1254g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1254g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104e6606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe600659385f4cae953e2eef481ba6f747dacff20dbcbcf7c46689daaa768e7dd",
+                        "s" : "0x14e2358fc259433d7a22801d139a8f7b2f9f2030fd3df0338e6b68083f8acc7c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1255g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1255g0v0Filler.json
new file mode 100644
index 000000000..5eedec445
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1255g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1255g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104e7606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc69bf4a9496fba91aa707e6a17514dfdec3151c6b8a02998367851882c7a9b79",
+                        "s" : "0x2b5a7149ab64e9cc6670bfe3b0314a556c54a9ff0d090eb976ce1ef7bdb87762",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1256g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1256g0v0Filler.json
new file mode 100644
index 000000000..124a61c22
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1256g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1256g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104e8606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6ab02f13d5dcfc93955901d9f3dd1c9e0bbbb87ce09ca35ef681a7871a2c7df0",
+                        "s" : "0x350e73c5b02608459fc62c91cf8ecf4fe9521c5b30bb14fd13f52f9cfc9a5ea7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1257g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1257g0v0Filler.json
new file mode 100644
index 000000000..a4f7c8b2a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1257g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1257g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104e9606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc96305153baa13385c4fc740aed093716b5a564b0fdcf11c4421e05b92ca462e",
+                        "s" : "0x653b625b687f89c8484103bcb7be91910ac96b25851124349f59ba57c22265c8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1258g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1258g0v0Filler.json
new file mode 100644
index 000000000..f7957341e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1258g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1258g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ea606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5af340a477ddd6dd77525a914e5ee75ec059cd7c1701b31d78659cd79bcc63ab",
+                        "s" : "0x026950588c7bfc280e8f5260c897b1f2dcad6e534a5bac30a082e1c2700e3c35",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1259g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1259g0v0Filler.json
new file mode 100644
index 000000000..554c92152
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1259g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1259g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104eb606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6569db646cf998244a0dd0e0106b22234d8125b30e3420e38ab7e7d24025a748",
+                        "s" : "0x5625e9404fb71e03b674f4bb59cc03def8b5f38d9b1e7e47aa708ae2251b00a7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d125g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d125g0v0Filler.json
new file mode 100644
index 000000000..b9487f39b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d125g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d125g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x607d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x68e6490aed9071c018a24f256f7b2f06ea118705280dd2598ac2251278e4b57f",
+                        "s" : "0x0e193fc9494ae230e685c4e48874c8d3e867ff0ce7b2963d8d7d625a8b4ab704",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1260g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1260g0v0Filler.json
new file mode 100644
index 000000000..c88d7f3fa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1260g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1260g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ec606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf4a957e37be9b29e59ae93425ec29e1ccef737b7b12aa38ebb10a129d61f38e8",
+                        "s" : "0x398e90891af02720db6e1056274aa60e917670ad67dd6c4a058687a043723780",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1261g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1261g0v0Filler.json
new file mode 100644
index 000000000..a9f31e422
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1261g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1261g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ed606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfbfd1b40835fcd4cdb838945610d969ad7d13210a6239648345b184eb1c1fe05",
+                        "s" : "0x6d9c51eff721afbe368ced95e2172405ef17276799bdaa2e0522c18598e17432",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1262g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1262g0v0Filler.json
new file mode 100644
index 000000000..78646e808
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1262g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1262g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ee606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb6ede74a7812a9cb2317688bf10aa7766aee5b8edeecb2d122dde3db03cb65d0",
+                        "s" : "0x7fc6b99453853bb4fb352c697327bb871c45251fc74da461eebbd2a33eb78e01",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1263g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1263g0v0Filler.json
new file mode 100644
index 000000000..12f8ac7a4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1263g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1263g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ef606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x33f814dbf8afd47d2623ec02c3fa710e1af9a0630aebe0df0b86069121aecbb8",
+                        "s" : "0x43b2eda8cb745f6068473a69a447ffe74b05ae67d1ad33733ccea4d790005d78",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1264g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1264g0v0Filler.json
new file mode 100644
index 000000000..39656bbff
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1264g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1264g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104f0606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc4655bae229ad4e5e03ed580987eaf4742ec3d8c2d79713f196f96ac8422c17d",
+                        "s" : "0x302b950bf9d35ea79bb2a65e9f07b4bff15878fc271944b5f335ba634c20c695",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1265g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1265g0v0Filler.json
new file mode 100644
index 000000000..27a7f1f74
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1265g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1265g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104f1606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe1309003c5b290bbeca0fb2f83660b62952de740ca8c67bd4298e57496944beb",
+                        "s" : "0x43fbfed509a6605174cc8041337ded4644e8709236a77db15d5c5894b53cf17b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1266g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1266g0v0Filler.json
new file mode 100644
index 000000000..212225b17
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1266g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1266g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104f2606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xee96a5b7dfaf02ad09055d690a0e8b47d26302a2b2d5fcfa18eb960e087c41c4",
+                        "s" : "0x72f3a27e03fe0de41affba3b5addf7d483b007e75f6ac81d45ecec0f361db7ab",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1267g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1267g0v0Filler.json
new file mode 100644
index 000000000..109ad0ec1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1267g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1267g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104f3606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcf4d214457e312816d7bb0fa5e747016bacb6af52463efd9a2e406e3586de6f6",
+                        "s" : "0x4066178b156ba8a97fd07da913ce8b9771c636dd117c0874d4ba2b6dde3ba9b9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1268g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1268g0v0Filler.json
new file mode 100644
index 000000000..1b12820a3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1268g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1268g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104f4606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x077a0d421d1b792f6dea119ec93766299b0008fc6d35877390868b1ad5a7b20c",
+                        "s" : "0x7eb238d8bbd4046793c71b517f57278458a618b010a36068d78fd98a940d3b1d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1269g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1269g0v0Filler.json
new file mode 100644
index 000000000..c2123a53e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1269g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1269g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104f5606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x15113aed1346feb237b0eb81509f25d93fd31b886c0e8d752e7d720da079db48",
+                        "s" : "0x6510a1913c2bfa8c12f14da8cee383c9fb662a6827910593588e55b6549660b5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d126g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d126g0v0Filler.json
new file mode 100644
index 000000000..b8e46950e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d126g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d126g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x607e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x346bc3b28d382fd93f24636585d1b39cda1bffed304712508916fb06fd6e6cf7",
+                        "s" : "0x528ef6eadaeba37b05c503d70113ece4e3b89830338286ab266b2f1b5d43557d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1270g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1270g0v0Filler.json
new file mode 100644
index 000000000..e818f169f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1270g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1270g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104f6606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb914e6401eeb0a8dce02da325ea9f3658dfd388db1fa84b66f1a852c91356c6f",
+                        "s" : "0x33445504ab9ea618147000a6181306510172e5ebcb8143fc120b892f843593f8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1271g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1271g0v0Filler.json
new file mode 100644
index 000000000..2ecc4776a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1271g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1271g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104f7606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb4a9c43a001b75340f434d20d91a841b96904550fb00a313d708a31c5e4d9b2a",
+                        "s" : "0x1223a8d53490a365906401852d48cd86514d826d910a041d892e7adde03300a2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1272g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1272g0v0Filler.json
new file mode 100644
index 000000000..c1aa399d3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1272g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1272g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104f8606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x18cbbe36f403202245b753e61d3a0374b6d5b8c58e43f8d8ef9d8743387572ef",
+                        "s" : "0x176fe6341a3f02862f80b6ca1e35c64fd3b406be70e80d8be90974a8fe71d067",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1273g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1273g0v0Filler.json
new file mode 100644
index 000000000..c4956ae32
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1273g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1273g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104f9606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5261b5c6d194ebe74e7365589326ef96a386a51951c4b07034bbf80231133419",
+                        "s" : "0x5aba1cf81ab3898ee61f24d5078e3813fa60c66e7bcfaeb05a2f2591bfb8c01d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1274g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1274g0v0Filler.json
new file mode 100644
index 000000000..852c9c3ab
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1274g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1274g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104fa606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3f73ff32b5ec64c7c6215b67030df9c8a90553cd824a4970359d443cebd90fd4",
+                        "s" : "0x05c481d5fc53b9b49e4fc36f6b4f1e354994390547ed182ab5645ea3f5b95baf",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1275g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1275g0v0Filler.json
new file mode 100644
index 000000000..eda6b2542
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1275g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1275g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104fb606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9ebe5db84186111ccf167dde116d32b80c7b33e688ec859c1168f6f97382cae2",
+                        "s" : "0x11a9c715d0e09714a8c27d24f4a9e9eb83622dcc657ade279567e1e3d3150038",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1276g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1276g0v0Filler.json
new file mode 100644
index 000000000..f03827d4b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1276g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1276g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104fc606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x36b6895934a82809d2c88d9e4d47f1772f9ef2698755193f1e2d21aa0708a683",
+                        "s" : "0x66ebfeb2502fff7ee85dbef525ed6fb39d187b4100e3dc96a34af4886bdf4505",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1277g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1277g0v0Filler.json
new file mode 100644
index 000000000..a01141088
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1277g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1277g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104fd606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe44e37ae9269309ac42a9e026bed869690d25c9241b342da1a3cacc103cc8b75",
+                        "s" : "0x46779ede06a89bc62544ca9968082352a9e9d5713db006779b8de4c8a17c2026",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1278g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1278g0v0Filler.json
new file mode 100644
index 000000000..2ee534b26
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1278g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1278g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104fe606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xea1b526f47fd984dadc4a2177e82cd3b82f26388e93fee8d8ff60dfbaccf0937",
+                        "s" : "0x7e14c66e51c136ea7e7a770d736174a66127bfdbd2bb5627d7916eff2a12025d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1279g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1279g0v0Filler.json
new file mode 100644
index 000000000..fb499b4e0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1279g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1279g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ff606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe385b76ed5421532fe3b147cbb40f281cce89dc9f9df29d7981aa9b77f8ec65c",
+                        "s" : "0x013d18ac0c01d1a40c4a7a2d2ff949a14df178d1e32d559c1a4f61514391386d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d127g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d127g0v0Filler.json
new file mode 100644
index 000000000..10b05bd09
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d127g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d127g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x607f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdbdedb1c47b018728c6e51741a8db6be6b69609ec3a65bc6677f8b1911a9aab7",
+                        "s" : "0x06e92aa1dc7bda145ca68ab30f54be9225b3823950bcedbebe1423ffd54f56d0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1280g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1280g0v0Filler.json
new file mode 100644
index 000000000..2c09febf1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1280g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1280g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610500606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4cb43f639be303e58c7debefb7a21a9f6c5aedb4178a79ce40fde11703a679e1",
+                        "s" : "0x470015f00ab44fa302dde5106ebc7aa4944e0a3e1bd22b00d287b45c684c1a15",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1281g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1281g0v0Filler.json
new file mode 100644
index 000000000..5a59e3eb8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1281g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1281g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610501606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x62daf5d1b95522aafeba92d75f9070eca0159ebef536a0347cd077080369e725",
+                        "s" : "0x0256a7fbe653fe2883d6707419c731bfe2bfbbedcc7566582ee7ae40ef5be1a8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1282g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1282g0v0Filler.json
new file mode 100644
index 000000000..005ad8de6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1282g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1282g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610502606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc636b766e0cd983402feec220a65fd29a6f53005cbeb633c7188e8b6b437bb90",
+                        "s" : "0x6f8ff44d74d252807f228f5128522642af421dba07f29f0c6459ed3777aa8e9d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1283g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1283g0v0Filler.json
new file mode 100644
index 000000000..b3e50916b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1283g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1283g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610503606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3ce5412f00e7f32779f1820a3f44c864693d64f87b2e8c69868bf8f86bd03e6e",
+                        "s" : "0x67223e0acea7125c0788fb5594cb0463a34437ab02e155ae6b64c853ad3f0b22",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1284g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1284g0v0Filler.json
new file mode 100644
index 000000000..269483fec
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1284g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1284g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610504606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2b1fddec9cc287972eec53dcf41e71d016658a079e76de2a91302dde84c5b1a4",
+                        "s" : "0x0dc5e3ed41157d4f15034e6c86904a99d71c0232501137703865fb2b430719e4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1285g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1285g0v0Filler.json
new file mode 100644
index 000000000..3188a22fd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1285g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1285g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610505606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7242d4a53b2ca29caee381b62911dd40c9f4b6fde4b9424fd08247172e1b4c82",
+                        "s" : "0x400876ef50e5d36fc742d12f5c54b84e733ae8271a84779ba991460658972c29",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1286g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1286g0v0Filler.json
new file mode 100644
index 000000000..697d28861
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1286g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1286g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610506606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3007cd04eb121ba9456d30d1e1351c7e526c0369b0e93e2c49bfe0e6c5c414fd",
+                        "s" : "0x687c020634d4f19da3f58d3941274c1b31ae019d91314c18bfb8c7b54225186f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1287g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1287g0v0Filler.json
new file mode 100644
index 000000000..04b5fa88d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1287g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1287g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610507606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf45abd81dfb6c1dddb453938c80a90b0b4cc3bf0e46949582fc66b5397bc4fb2",
+                        "s" : "0x0187798195d353d1ed8831d9bcc36574bd8abf666b9146062a17e1cbd170b1d2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1288g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1288g0v0Filler.json
new file mode 100644
index 000000000..7e661945d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1288g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1288g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610508606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdde829e1013cb90239041a7edeb2d67c7f570556b536326409622dc2017002ac",
+                        "s" : "0x79d12b4c681ecb94ee37fd9674bb94920c24e32484f9df5306fde66e49ca342f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1289g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1289g0v0Filler.json
new file mode 100644
index 000000000..dfe2dd14e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1289g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1289g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610509606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaf4718bebdc5682c50607cf604b85a093ab23bc128c37de0e63dbaa57f89c52a",
+                        "s" : "0x58f695c2a6c4819d3bbc7b635ff21a220897ca2675d6aa94c91cab90611363",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d128g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d128g0v0Filler.json
new file mode 100644
index 000000000..a7e1d2d3c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d128g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d128g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60806064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb73bc6b1b63cdc4a45d2e9ec58e3e657aa686a3b6d5e9c399a80b4e5cf0ef918",
+                        "s" : "0x6a1d4e5d2ca3ecb090f29b14489baceb1ae0bd64c073c7eaf8dcc1ec760466c3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1290g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1290g0v0Filler.json
new file mode 100644
index 000000000..7840c5df0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1290g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1290g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61050a606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6aa8344d28dc8a06684d56bbff22779d81b8cc3a819cce90fa21d836f2114311",
+                        "s" : "0x14dfedce3b07900168714bf7cd4479781177dcd1aa5e9e2c99ff2895a6622a7f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1291g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1291g0v0Filler.json
new file mode 100644
index 000000000..c352f1ce9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1291g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1291g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61050b606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x92ecbdb989e0117328b18e00c211f626a2cd3e1822c3ac0a4a9e0d03a07f737c",
+                        "s" : "0x22e9195a9941b1a5e30df78a416441bf0b3bf3b898c3c263200c0b960d6b0455",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1292g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1292g0v0Filler.json
new file mode 100644
index 000000000..2c617a357
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1292g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1292g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61050c606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb9c971fe32cf5b2974962a1e8b4f7b1736c687d624c4a1f075b7f7f168101414",
+                        "s" : "0x1ce6d3e171c27b2f77edb13119294a85e7f92143cfeaa4782aaccd64f01a54f3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1293g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1293g0v0Filler.json
new file mode 100644
index 000000000..cc540e278
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1293g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1293g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61050d606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x24c4f803737012a155e642ce998a2a11339138339fb8488ec637ad48261137fd",
+                        "s" : "0x13534e6799063be39a4ba3a37709bc6bfff7bf53798fd7d5af42e4c45763b90c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1294g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1294g0v0Filler.json
new file mode 100644
index 000000000..8013bccda
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1294g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1294g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61050e606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x090ced6665990a29dc780cf09ad01d395a08a0b6d06e0100a06c9d1ca0d3250e",
+                        "s" : "0x11b2b0af569a0718002e171c24f206351463b20363b2017266c18cb80151cd37",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1295g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1295g0v0Filler.json
new file mode 100644
index 000000000..24a52f907
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1295g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1295g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61050f606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8796c076a0954a1d94278f768c744937b994ab8110299228906eb4e1944c4fd6",
+                        "s" : "0x5c170acc53b392726f8652f1f9fc7a02ae9537d53f48803ea9cabf2283614d31",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1296g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1296g0v0Filler.json
new file mode 100644
index 000000000..dd5128772
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1296g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1296g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610510606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x57619af5033d03360ed2cc07a3452d1c028e123151451d20f2821737605bcf1e",
+                        "s" : "0x63ff6234b73f8bf99f758654b310310a1ce9bd1a1023eacd7e917dc99bf43c50",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1297g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1297g0v0Filler.json
new file mode 100644
index 000000000..52bd32042
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1297g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1297g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610511606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xff9ce5fffcef9fda822614ba0265c40da65d962e57dce9e1d9d9d2c4334d4d3b",
+                        "s" : "0x0d6b099e8d4c99aa84fe42b1407e597eb0356c3dcd2924983bde47f72dcab2d3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1298g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1298g0v0Filler.json
new file mode 100644
index 000000000..eeea4353e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1298g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1298g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610512606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x389c341d848d70d0e12651ddfb06a16f3746b2f7ded9bf969316f0f9f4e9f9e9",
+                        "s" : "0x570b0bb08412c571d0feed510c4bc1459e0bea18041c84c3a54bf8483321cd65",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1299g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1299g0v0Filler.json
new file mode 100644
index 000000000..e69fed9f8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1299g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1299g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610513606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd5d61d76705b129e36f67beaae78c7bec90e2a93d12090ea4954900cd90861b6",
+                        "s" : "0x5f19caf0f2fbe7cc24c2843cc302b3c7ce3f40bc392350de96eed41c4761774b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d129g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d129g0v0Filler.json
new file mode 100644
index 000000000..8641203fc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d129g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d129g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60816064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdec1d5594cdc9931fdcf3c18f05e76f482229e67fb53051aeff699fefe44f8da",
+                        "s" : "0x64e2b6fb8d357839b5501ffccc2ac325203e8dc5af55f0965e61c5add435f790",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d12g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d12g0v0Filler.json
new file mode 100644
index 000000000..c6d4b6ef0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d12g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d12g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x600c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x77312fb875d57f6b8a79a16e14779dd04d68cbe320b7e2020780796c4fd0668b",
+                        "s" : "0x7e48a5dccef6df74a509ebd3d1b8f54615789a41492c490085f0f3b79bab611a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1300g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1300g0v0Filler.json
new file mode 100644
index 000000000..5a6bfb6eb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1300g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1300g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610514606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x33a64dd7ebbe16f6f7b72047adbf334044452ee9f7c1b3f0ecdf1a53e93bdeb3",
+                        "s" : "0x2b7a156577db041cc7bea3004a815ea4b4ff0354fff9a90f8de300d9f8e9533f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1301g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1301g0v0Filler.json
new file mode 100644
index 000000000..0c144aa44
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1301g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1301g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610515606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x664ae8d4ef1049128e209d546b0e1b06c7ce90fa46b82da17124771e3348c111",
+                        "s" : "0x5eef2943d18a6f35d9959878d268bb5f5f3f8552ffcf8d58d6d0285e29451a83",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1302g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1302g0v0Filler.json
new file mode 100644
index 000000000..a66403ef5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1302g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1302g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610516606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf474470c0dcd7dab830e2c1354ef186e13f2666485f9eb208fe1e920007fdb47",
+                        "s" : "0x4de867b7e760cfd9b771271bb1faeb007888508071f191e30cd2d31a40098b73",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1303g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1303g0v0Filler.json
new file mode 100644
index 000000000..bc0a57cc8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1303g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1303g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610517606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x142264fa29a1589135a7ca26e8bcf3c86947f5ae24acef27ef68d75cdec2c27d",
+                        "s" : "0x601640082b990724a593521718ae0e9d0990ef030f904d377f261813e951247b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1304g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1304g0v0Filler.json
new file mode 100644
index 000000000..7cf058b46
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1304g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1304g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610518606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1cfe425ef17c3f21d9e86990727a6455a013324acae38e6fba953e2df6fd3a77",
+                        "s" : "0x7c1cd980699904424f5e96ba08f43985738e2e8008006ec7df0d57333cd14380",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1305g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1305g0v0Filler.json
new file mode 100644
index 000000000..a07215b1b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1305g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1305g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610519606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe24ada6046f26bc5509ee630312f90480dc4aff5bd1432e80fef560b6ff31bbc",
+                        "s" : "0x2897194bd8db0a03ceb983716e81bb5e1810ec9beb591291bf5d6a29fa7ee059",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1306g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1306g0v0Filler.json
new file mode 100644
index 000000000..7eaf6f89c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1306g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1306g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61051a606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe14650c6d160cfdc3cbd6c599b2ce912e2170652e72e1497d3fb4a05b6b584a5",
+                        "s" : "0x748817a21585eb66a01d9cbc58b84d46ab941b0e020842fdacc35ddc08714da4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1307g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1307g0v0Filler.json
new file mode 100644
index 000000000..091312f67
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1307g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1307g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61051b606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6dd24e350d75500f82e41a00233b8403d0c08159af179bf4f7a2f56053dcfbc6",
+                        "s" : "0x7550530e2b21638ab4e3e9fdef54297bd6f23c78d8c008b5e1fa3c49266558cf",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1308g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1308g0v0Filler.json
new file mode 100644
index 000000000..9f6df3ffe
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1308g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1308g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61051c606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc244a2cd09af2fd914ec84bbc324a23d5f7b49b5bb26f9fc6bd909f54185998f",
+                        "s" : "0x6939a03c8f22cb6b5305d0acdfd22bbad80336108493a4f072c6c6e604ac4aa2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1309g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1309g0v0Filler.json
new file mode 100644
index 000000000..8adc9c9ab
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1309g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1309g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61051d606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x660fa9fab2cf81e0dc154b85b0b399ed640414f8886c594c5b6a78490cf0d7c4",
+                        "s" : "0x418b5d4a5be1659145db46de59ca1f611f16749c9cedb60d82fed91322aef652",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d130g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d130g0v0Filler.json
new file mode 100644
index 000000000..43ffb8cd8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d130g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d130g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60826064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x57aa4e984b2d0d73bd431b71dd1e6c4e4b9189522ae12e0c1c13e253fd5a9ac6",
+                        "s" : "0x607b34cc282662b399aaad4e1f89e86763c192eab4dbcfd3dde4b4191bcb5e60",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1310g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1310g0v0Filler.json
new file mode 100644
index 000000000..422b158b5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1310g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1310g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61051e606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x936296d827b82cae296b48f7881c0a6f262c9d49738d64639bc79fae57926a6b",
+                        "s" : "0x04f6d4d48e3e64c9c83961d301da3c8a74dc6afd9fd9a4a8d0700e4437087432",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1311g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1311g0v0Filler.json
new file mode 100644
index 000000000..64db15607
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1311g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1311g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61051f606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3c3e040eb6422975d82f6f42f45743abf7504b686fbcdee2d6d9701b59571a5c",
+                        "s" : "0x780f95963cc869b984fa36fcd1607db6d649f355e56ab3149ca9180979a86b00",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1312g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1312g0v0Filler.json
new file mode 100644
index 000000000..b87cc7051
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1312g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1312g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610520606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x920d73d0933232cc973b126c6190b00f1bcb6da69b566ce75d57773126e2dcbe",
+                        "s" : "0x2b47845d40855182c16d64a44fc678256b7c4f1d8481a113b2ca936f2bc59252",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1313g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1313g0v0Filler.json
new file mode 100644
index 000000000..d65629b4d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1313g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1313g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610521606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc1f0dc77135600555aaa6e656d7a589d91fd6e8666cbd28a6c0a4e85ebde574c",
+                        "s" : "0x541be1c87a2b4eababe7fb642057a96d5cbdf3f9d40df3874650b65cc9ed69a0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1314g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1314g0v0Filler.json
new file mode 100644
index 000000000..ac8d2dd5a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1314g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1314g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610522606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcaaa173a608899104afcfcdcff3b371951cf587bc02293ffc965f1d921557486",
+                        "s" : "0x5f6a158a37996902d86217c64bf667f53ddb0be7d730bb6aa45ea674e991b06a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1315g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1315g0v0Filler.json
new file mode 100644
index 000000000..7f7be1d91
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1315g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1315g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610523606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5ecb61c37d7e79ad65b40a9fc64f0650c3e17c6a208e13746b9a54f0a4969abb",
+                        "s" : "0x6a9cac454a273ae0e356138c271dc2df196bb700588a5d2b22f58e337a655acb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1316g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1316g0v0Filler.json
new file mode 100644
index 000000000..cbe8c83df
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1316g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1316g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610524606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa633063f3658046b5aa33774ff229589cae1362027e83d28f00014788cc86f67",
+                        "s" : "0x56a98e68dfd184cba3af13c85a7b1c0427bbca8f362b5c9fd466b6bf14abe3aa",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1317g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1317g0v0Filler.json
new file mode 100644
index 000000000..dd51b2586
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1317g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1317g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610525606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x66760a35abf0b19ee02a2013bd07f1efb727c4dda6159432f590a2fd84cef443",
+                        "s" : "0x733a0c72adc135200b3da5690e2ff3fba24a481b8ae1136b68fcec1c751433f6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1318g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1318g0v0Filler.json
new file mode 100644
index 000000000..7132b580b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1318g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1318g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610526606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa44b70d51a37458cbfd87b45c2e5a0421d132d3acd759dfca4dfeb532f4d9f57",
+                        "s" : "0x558f2e3ca375c2c9541c4f01de5fc2280faf0f7d31ad8f1fa09ea076f0a98919",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1319g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1319g0v0Filler.json
new file mode 100644
index 000000000..04ceb987b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1319g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1319g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610527606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc4b3ee089c6f2a30fa9b1a1c61571977159feb46ee72787372005571ac7c07e4",
+                        "s" : "0x45a28a82c1bc5442bffd20db6bc80ccc3bea1d9c4798623a2cc556bd5dcc1560",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d131g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d131g0v0Filler.json
new file mode 100644
index 000000000..e4bfba224
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d131g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d131g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60836064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x785b657f8ae56829ef833ab78b6d398b4337d1604e7dcc962d72a1f903a850fb",
+                        "s" : "0x7499700246eb94197d9bfe6646ffbe58698f903770d33b693ba186f4a7dfb8f5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1320g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1320g0v0Filler.json
new file mode 100644
index 000000000..a0c82050a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1320g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1320g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610528606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x541e99491db8337938b32d20a6b772651f65255701d8020c47a11e1acc5a8798",
+                        "s" : "0x1496eefe65a4fc115e6d4b6417264bf9c2bb7b22e1595d8750fea6ece6af8532",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1321g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1321g0v0Filler.json
new file mode 100644
index 000000000..92d69e1e6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1321g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1321g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610529606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5ab42bed48dc4d062254745d8b52a74c6bcea2a764cf1e59f86469ff759c7442",
+                        "s" : "0x7e8fabbc0ddfd5938f18c711ef58561f44878d8f60419e2fd95d11ad47654528",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1322g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1322g0v0Filler.json
new file mode 100644
index 000000000..9f4aee214
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1322g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1322g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61052a606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0f815cdd98ae18077cda52e2bd84fd7618aea7789113c18b51acd259ee1b9ad3",
+                        "s" : "0x29a68f48c9553e8e4b4fb6b0cf3478b4b31627cdc605c424f35557cbe9715fe0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1323g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1323g0v0Filler.json
new file mode 100644
index 000000000..bb6c11023
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1323g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1323g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61052b606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd92b5d3ea7bbbbc43e05654fc9e02cfeda45f6bbc017e86783b35bf785f93057",
+                        "s" : "0x67bdb1cae5dc73bdd152e6c6612f4c6c05c0c910721dc61a90c0bc402e2cd719",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1324g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1324g0v0Filler.json
new file mode 100644
index 000000000..76e651fc1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1324g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1324g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61052c606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x78da7f8786af154e0fd1e28501290ecd9730eb5afc4aa38fcc85ab992c4ee0c7",
+                        "s" : "0x7816fbeb5897bf28aeb433fd99154e56a87629094eb2ec5ec98f658baacbf133",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1325g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1325g0v0Filler.json
new file mode 100644
index 000000000..121b9f863
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1325g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1325g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61052d606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa45d203a2f981d33e93fb55c629ae43360e163a8a8821006fc593bbf5d89e850",
+                        "s" : "0x1bb4802e0e4c4dccbb1d5615f8c1938fee5dff0ca0e7b068ccdefde1b805f16c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1326g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1326g0v0Filler.json
new file mode 100644
index 000000000..7ee933fb5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1326g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1326g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61052e606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe08a377cf0b04d10168dbe3140f3b9ee4ef71f2f445f0d5f2a6304254e8e5941",
+                        "s" : "0x1d3bfa062dc8bd91a8cfbc2b5b3d2049c171306146c04195fa121f2beb57baf6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1327g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1327g0v0Filler.json
new file mode 100644
index 000000000..0062b0427
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1327g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1327g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61052f606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb440424a3a70c675925a8b9f6a1718fb49e7779396cc38b90d9a100d56f1b83a",
+                        "s" : "0x588538892d516aa0a72bd4cd881851b9e4c6cd256b4cf2e81b565dea2a49623e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1328g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1328g0v0Filler.json
new file mode 100644
index 000000000..03e039dc3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1328g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1328g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610530606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x58457858f60f671fe0bbb3ee2b56e78813f69285feebc9ff28a2d4da3b52d7db",
+                        "s" : "0x42d97a486e10cda1fa2e420d5bc8197b5373990f467ee7ef765393c239da2f6c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1329g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1329g0v0Filler.json
new file mode 100644
index 000000000..a4eec490e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1329g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1329g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610531606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x748df099112666df289356a07af38364eb650485a008731c6799107290ac291e",
+                        "s" : "0x1a5aaf624515fda365d37579393584bae114372dd91e8850e86092347fd3fe6c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d132g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d132g0v0Filler.json
new file mode 100644
index 000000000..debb2d804
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d132g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d132g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60846064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x519b786fff16e7d7e797b31f827c47c9e727aac0739caf0aa50a32b3e8e46bdb",
+                        "s" : "0x25e71a5f5aa3a9c3da75efbd75686ff06b71f5242f8f6ee0fe6afc59f4d6eee6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1330g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1330g0v0Filler.json
new file mode 100644
index 000000000..045cbb1d8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1330g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1330g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610532606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd69a6243c9673250916b91a3b0bf510b2243940705ac0c646623a692b1b15ba8",
+                        "s" : "0x5f835c0c027a0b45e6085b654cf379128a197ac29be466f63ef705559cfb4218",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1331g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1331g0v0Filler.json
new file mode 100644
index 000000000..783a1f2b5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1331g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1331g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610533606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf7d22fd9f37b8dc1a986bc91c8b53e9a57e400de499d4ebac152bdf82015f51e",
+                        "s" : "0x1157b51b05f101001169c74876e0fddbaf79981a3ba2f64d73a6f571029fa524",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1332g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1332g0v0Filler.json
new file mode 100644
index 000000000..d5b6b4ecb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1332g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1332g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610534606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x386eb0982dfcd95b843c4579c3122c956a3014715ad9bfeb50f1977dd1a5fca2",
+                        "s" : "0x7c61d6c4d47cabcf18a6e5c595e09ae8a574ea497cb1b3baa57dff3304eac968",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1333g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1333g0v0Filler.json
new file mode 100644
index 000000000..4828aed0a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1333g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1333g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610535606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6df2f3f5ff45ae8774f18bdff639c5f410d12922ff2a3e229098aecc74a5910a",
+                        "s" : "0x63e27228b8ccbcd8f3f110023f8680269448c7f2a8c964ceae6b3e0863323148",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1334g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1334g0v0Filler.json
new file mode 100644
index 000000000..dd9d5706f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1334g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1334g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610536606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x65ecadb01f5779b29aaf72e59a990cedf1eba831b21aa2bec98e006a01c5a141",
+                        "s" : "0x519117e2db28f739ee81f037471eb4807227a022d2f969c668c07bff687f5f41",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1335g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1335g0v0Filler.json
new file mode 100644
index 000000000..efced340c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1335g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1335g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610537606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x81e5d5bd5e60ddc98be1415030cffea39df7df30df7f9a160c8f665f53f3a86d",
+                        "s" : "0x061beacf1f5bcf582c9cdc8e7235f5a5fd9a012d8306a3afc2c601877d0785f8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1336g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1336g0v0Filler.json
new file mode 100644
index 000000000..5bce6fc27
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1336g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1336g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610538606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2048308b7a9d8afa83a0482161ccc085ff2fceecf893352fcb515f2e83cf1ebe",
+                        "s" : "0x48dde8c8b7c6af3af0339ab1df7e30394472c031830a3bbe3ff9f3fa4404b5a2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1337g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1337g0v0Filler.json
new file mode 100644
index 000000000..79d139a49
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1337g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1337g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610539606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6e0e1d5303061fd458a6c0d7b19d404d782419b55203f1c8a0f8d1277fb98527",
+                        "s" : "0x15b39846de933a6114627a4683a6c74c38d21fa186cd6a22eebaa1f545058eba",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1338g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1338g0v0Filler.json
new file mode 100644
index 000000000..b455fcf81
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1338g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1338g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61053a606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd179a1d428343bd9e92bc63756d7a5996bea360d8916bf643cb20f118b371ff1",
+                        "s" : "0x135f3d73546bc90431911d1cdbd1ec14c9878286623c84eea08c5839f18ea554",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1339g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1339g0v0Filler.json
new file mode 100644
index 000000000..3c45b80f7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1339g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1339g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61053b606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd02c8d7c0151ceeafd5596140050a7f4c7fe23a0b80908423a7e28f395439509",
+                        "s" : "0x46bdc0e06adfa79e13f9d152f78edd63fa62fcc6a60dd33fa56941d3d20045a8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d133g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d133g0v0Filler.json
new file mode 100644
index 000000000..94950fae0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d133g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d133g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60856064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa124ebfac862618fd574a34df87ba17b278657d8f5ec74a96ad864db78ef3b2b",
+                        "s" : "0x1b20a5bbacd3dab037a0a533c01bf21efcbe4dc074a43d89ec6a382378744a95",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1340g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1340g0v0Filler.json
new file mode 100644
index 000000000..236e704b0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1340g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1340g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61053c606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0be9889f087c670e579b57ad7c8fcc23aabae516940c7879cd06684bc8c56121",
+                        "s" : "0x12372a4b19296864cafbb100ddcbc1d3131598215709ace6528e8bf93183d14a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1341g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1341g0v0Filler.json
new file mode 100644
index 000000000..5cadf7dd8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1341g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1341g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61053d606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x276782a4ec74aee258992cf12ab0f00e8429a0ced062a47617350dadcaa02ccb",
+                        "s" : "0x1430754d8e1db018b307d642f8e48175cf8d5b9c91d1db749650dbc75140c18d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1342g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1342g0v0Filler.json
new file mode 100644
index 000000000..794d53e47
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1342g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1342g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61053e606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0a631871615916621cf0d90cb139e00315591dddd629033155d3e4e7fdf08137",
+                        "s" : "0x22c2a448e8649adfcb798dc28d4c5f1786bf4c0cf3f3dcc5a14e8d474ea6ffa8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1343g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1343g0v0Filler.json
new file mode 100644
index 000000000..9fd8d0b7e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1343g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1343g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61053f606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe97e69afcf312e9d1de3b8fe650c4e948ac99819f101cfb3a4f423488e198713",
+                        "s" : "0x42049829754cc0e207a4308126b86805c75a40ba543c65d4ff7945b7cbf20d7c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1344g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1344g0v0Filler.json
new file mode 100644
index 000000000..3eadfa093
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1344g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1344g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610540606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6c85042633b23e497e2ab05f484ba7ab5d9495b99d93babdf4f808fd85b646db",
+                        "s" : "0x1e648e51d2d84ca97abec1ee2646f37f302a823b6502943d8765e68334d8749f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1345g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1345g0v0Filler.json
new file mode 100644
index 000000000..3158b93b2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1345g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1345g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610541606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdc33992f1c20fa8db7f3df46b51c7094b6c096ee532c6dee0b0f4b8510353e8e",
+                        "s" : "0x55eb4232e73da823f97600c2d92e9bb0ced72d67908b6898b72138ba3382e503",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1346g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1346g0v0Filler.json
new file mode 100644
index 000000000..d79133646
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1346g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1346g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610542606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4db9258274e040ee3da8873614b9ce3183a80e0824e61ee576933fb90a6c9c38",
+                        "s" : "0x04a4e5bfdc68f987e22c151f8e931708d413783babd8613b78823473781efc",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1347g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1347g0v0Filler.json
new file mode 100644
index 000000000..7c4ca7686
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1347g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1347g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610543606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7a61bb8bf7c08328eb0051548c28294ee0f2a3c4ea6aa6aa9e020313d66169e1",
+                        "s" : "0x7ffcdec5facef673a7a357eed88860b59c3e74e33be6948621dde1b92ff1e6a6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1348g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1348g0v0Filler.json
new file mode 100644
index 000000000..a2e94d416
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1348g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1348g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610544606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdedb456827aadd2b436dd4c3ac866d5ba882cdfc48d6f4e130d35358a9ffc443",
+                        "s" : "0x1cf001cf7d211188fd5613ef89f2fe391f1882264c23394227c7949beb7c3fe1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1349g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1349g0v0Filler.json
new file mode 100644
index 000000000..d3df86276
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1349g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1349g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610545606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x44c40f0fa310066914bce3f2fe078a8c51f2a4d5b5f2a3a359af5164541a2f7b",
+                        "s" : "0x20db1dc9469174bfbdc1aebe843e1f52c1c4dc4f5e527c565e845195fa27ae52",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d134g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d134g0v0Filler.json
new file mode 100644
index 000000000..91d3ab454
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d134g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d134g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60866064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x383e5c8e5fa61da47c3259542dcba18e8fa6fec5fc58f4788fe9b330dbce88da",
+                        "s" : "0x26f5bfbec80d2c648345a00081c743f33c3d94eaf4d216fa939521b6c0b1668c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1350g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1350g0v0Filler.json
new file mode 100644
index 000000000..fab9056e5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1350g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1350g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610546606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x54352b2ca5451edc6eafb25dcf208036828e809440bb4b19d80a4020d03a2145",
+                        "s" : "0x111eb5a5cdad8a4eff7735b8e4681493c36b0173c6a0fe1707d528c15feddc88",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1351g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1351g0v0Filler.json
new file mode 100644
index 000000000..4941a6e12
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1351g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1351g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610547606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4c1336ca38d2d035b183bf57717b8fb4aa6cf25a36196b0394188e413b8f7634",
+                        "s" : "0x785564e8c90089adcfe844066f63d8a646f4f694c61b247a89c57d0d4c4333ce",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1352g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1352g0v0Filler.json
new file mode 100644
index 000000000..99da10994
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1352g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1352g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610548606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6558be5b087fcac7a1da7fbd9457eef9b0e78026a1b291a885dd13eb300ad53f",
+                        "s" : "0x3689c9efb9552c11f71dc5fd783692d0b2a631d03fff470966541b89f32196c1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1353g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1353g0v0Filler.json
new file mode 100644
index 000000000..346a8e94f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1353g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1353g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610549606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x589f3692bb8b5ede4a0266900f1f393738fc254abd3bfa66dbf7c4539119cd30",
+                        "s" : "0x515fc668539be104f142a9f74a34b9ea55497308651dad8f291e9f97b1d6f747",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1354g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1354g0v0Filler.json
new file mode 100644
index 000000000..fa594b459
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1354g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1354g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61054a606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xedfdfec70119bffe548b0455992f82cbecacf326c552b41782b6b7be20b67992",
+                        "s" : "0x68d17c2ab1a80432f1883fff48c60b0ecb437704d6c501810b802f2d18deb740",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1355g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1355g0v0Filler.json
new file mode 100644
index 000000000..6c052960a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1355g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1355g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61054b606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdb6905a02580d0ef8db34f38acbf2aa9cd18f0a8f7d85905484af8d79d6a25fd",
+                        "s" : "0x634637b3efe58ad05dbdec03a58307c3fb65961ad34f47b573908c74272659e7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1356g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1356g0v0Filler.json
new file mode 100644
index 000000000..2bc51ec50
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1356g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1356g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61054c606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbb36d88bd81a8c41acfafbaee875262352d0bee0eb450dd562672ada8dfbaf81",
+                        "s" : "0x0b986ec9f43360812473cdb9ac04d1b18615125f118f4524a8bcf6935dd09267",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1357g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1357g0v0Filler.json
new file mode 100644
index 000000000..fd52b4f2f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1357g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1357g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61054d606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x61709a728c189933189a8adb45d7adf43ed728a3cdbce24c2d7b3842d97842a0",
+                        "s" : "0x7b7455d65921514fe24138b8af69b4a12c47a600bef1c6107a9acb760239ae3f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1358g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1358g0v0Filler.json
new file mode 100644
index 000000000..9d291dbf9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1358g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1358g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61054e606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0e3bec3aae902d91689113dd16ba5f9623b6bec6d95a0e1894bbb66b0200656b",
+                        "s" : "0x18cdf4214a7ca6bb4bb7fe91aec7f4f3a11d2f202812e8ef28548d91307cc966",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1359g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1359g0v0Filler.json
new file mode 100644
index 000000000..ee9dcdcde
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1359g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1359g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61054f606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd5e0ab64cea9d2b9e1732bdbb30121f11d9c5a71add9f648df63b2ce8a5a6e1f",
+                        "s" : "0x70f0f7a6bd965311fe3dfcadb835d37c96b464bbbfa3e1c04500289b2d197682",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d135g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d135g0v0Filler.json
new file mode 100644
index 000000000..cbb7a2e99
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d135g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d135g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60876064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0bab1c91e4ff8614eef05395698f1d0d9a20ceb30ffbbedeac0116f7eadb9c03",
+                        "s" : "0x1d0a9d0ee5e23aa82bb5098cd124c21b3d056cf47e7d1d02b538c9614a302daf",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1360g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1360g0v0Filler.json
new file mode 100644
index 000000000..13d999088
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1360g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1360g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610550606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x16858afa253bf37f63dc1759fd8bfccafb84fc12857cf4ee863f6c67a2572317",
+                        "s" : "0x3a5abbd5ebecce258227a733e4664d8a6768862580c88f792ddabc1b6a4dcf03",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1361g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1361g0v0Filler.json
new file mode 100644
index 000000000..f5c82800c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1361g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1361g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610551606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7f61dd8a446114eb1dff86859b387a0e5050c4dee098ac8988ff36afc53ca6f8",
+                        "s" : "0x411835f217cca1c96b40c4ed1879e253050b0136a975132414ca9844d86939de",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1362g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1362g0v0Filler.json
new file mode 100644
index 000000000..b67fbfc89
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1362g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1362g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610552606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x38d4611a428cedc214bee3511e1717f9e567262cedce0f65b6f045a32e448182",
+                        "s" : "0x28847d907fc00eced2c811c37c6853172bb65f8aa9d41a2aaff779a1a3059221",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1363g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1363g0v0Filler.json
new file mode 100644
index 000000000..bb18831b8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1363g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1363g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610553606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1da25f5196c2e5c4d27c947ba60d68580b8daf0944745b290977caeea9a0f711",
+                        "s" : "0x1e0aad6591de6aa73fe5b4ab7002425fcfcc51263f88547cebabe6e58261b63f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1364g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1364g0v0Filler.json
new file mode 100644
index 000000000..4f7cfc05a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1364g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1364g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610554606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x72b623d07a38abdefff72a3fa3cbba18d728cdc35dfedb030af2ef2d6833522c",
+                        "s" : "0x6afacad1e1b92f2b0782b4e82759d6e44c834debb02c19f96fc2bd2484af18e4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1365g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1365g0v0Filler.json
new file mode 100644
index 000000000..51dbb270f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1365g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1365g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610555606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0ca03881cc4404906bcbd2b04a3263a35f01ee327839685bda5e6a7f0c5ef809",
+                        "s" : "0x4e9e9886e811e5b3a8a2256d97009cd6637904575e2808ba512ee11fe0963dc2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1366g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1366g0v0Filler.json
new file mode 100644
index 000000000..2f170b0ec
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1366g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1366g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610556606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf12b15aee83e8ef3ce78407b65532ec8d81fda1ac6a1b4ad8fc5cb1b6a2acca7",
+                        "s" : "0x10af9cd6a14c06c860f0a4e659029d2e25cfdbdedc3651b498771886a15ea73d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1367g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1367g0v0Filler.json
new file mode 100644
index 000000000..4b667765b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1367g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1367g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610557606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x167c45b413e01524c9d2a0812c98a2e5708400fe01462a4deb6ed7b5c6239479",
+                        "s" : "0x4bf0ce1a97a9cf0f27d379d6345fb015ffbcff5b7d640089d5767fcc62135487",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1368g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1368g0v0Filler.json
new file mode 100644
index 000000000..955b25781
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1368g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1368g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610558606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6f12ea836a57ed420dd2c86e58515386d13d567662a0b86c4b2d111deb629ad8",
+                        "s" : "0x79f1edd6ba4cd999f3545413d962c29ae5993321bc721c682be7fd143cfb3e01",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1369g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1369g0v0Filler.json
new file mode 100644
index 000000000..200ad6fe0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1369g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1369g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610559606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x41ee5d27ecf6eb8bf60ca9b22ba3ef86ea5f90363c66bee0358a4e810634349f",
+                        "s" : "0x500a4d3ef0cc9958465592bf41a3dff69619dc30292bd5bf05a3ae96d6f9463a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d136g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d136g0v0Filler.json
new file mode 100644
index 000000000..0c7e6c794
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d136g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d136g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60886064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0f11573ab15964ac048b4b5151e59f4ac0aad7a26d536cc3eb3c6ae3df1f049b",
+                        "s" : "0x795469d2f80d1d8d39d2595da86a42ab9c3fbb20cbc9fa88652a0111a06f1006",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1370g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1370g0v0Filler.json
new file mode 100644
index 000000000..44b66dfc4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1370g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1370g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61055a606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1890f96d8555ed19bb5fcb5b9027ce780218a2313f3363faf06241c4b75e0c37",
+                        "s" : "0x36a83cd859bc61a249cce81e2cf429b46f708d4a5f99b293ef7e7d637bb0f80f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1371g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1371g0v0Filler.json
new file mode 100644
index 000000000..219acd545
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1371g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1371g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61055b606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x84292002223f9a51e57a1e1754d153a321f2a1f4a4b08fbe211e5d818d01c1a2",
+                        "s" : "0x46e6499e63d828c13448356a32fc91584b64968c75fffd40fb8b4ad6ff75088a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1372g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1372g0v0Filler.json
new file mode 100644
index 000000000..f82c6746b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1372g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1372g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61055c606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7186c99ca7452d5e369923d0c06f40d8f755de73e760c8871a1bae458396f825",
+                        "s" : "0x7c0c0d0163925d5f2bd10de60c8369179e2bd2bdd2d91fc9491168e3cd43377a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1373g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1373g0v0Filler.json
new file mode 100644
index 000000000..727c2248e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1373g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1373g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61055d606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3b72f0a83b17ba3e7cd91d57f58c5b2453f49ca65b3b66fde79645ae5628e033",
+                        "s" : "0x1a298c53ecfeb973bb0715fa8366c023d2ce81d7e1844152fc786c4730424e8e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1374g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1374g0v0Filler.json
new file mode 100644
index 000000000..297750cf3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1374g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1374g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61055e606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6a95c43247afad1419ada299bcbad6449a74060d1f5c94974773f7389ef91268",
+                        "s" : "0x7958de27653e56f4ca993accc1be97ccc44b9d313ea8464712fbcc4a07d5021c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1375g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1375g0v0Filler.json
new file mode 100644
index 000000000..b55a9130c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1375g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1375g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61055f606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd901d37d6467d3888eb646ed68537479ffd32caee546eb772adaeca96cf56a19",
+                        "s" : "0x2cdbf721cf822c05d3492eace6c6da25d4fb15a6e639a302eef6396b7b24cd04",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1376g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1376g0v0Filler.json
new file mode 100644
index 000000000..dd15f255c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1376g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1376g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610560606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x78b2babb693ba5ef50a40f0a9b094abc458afbee113d7f0eaef5bc6c6538fcf2",
+                        "s" : "0x5fc8e36d83ada4da84b253c45e680e28a4f3cc9c5dbf30042b08b49f4c9bd8d5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1377g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1377g0v0Filler.json
new file mode 100644
index 000000000..1b1503e24
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1377g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1377g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610561606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5cc41d73b6970fb021192e09ca7a0ddebffa54565df6feceba322a7fa7af1c4a",
+                        "s" : "0x77fef0daebded207cfe265fe936ca2e1c4f8f3a17c8170f2990a4149378e0015",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1378g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1378g0v0Filler.json
new file mode 100644
index 000000000..1de5df3af
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1378g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1378g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610562606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82d7c821e3db6e7fb53c955d8899c167a92ee368f28244fbc1fc1d93d795f7e9",
+                        "s" : "0x14d2f31d0c6f6fd860cee4f1a4f9bc8c2e121aded880a2c0bf1ad1e9d5cc59b9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1379g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1379g0v0Filler.json
new file mode 100644
index 000000000..d61b5d341
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1379g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1379g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610563606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa3971e7aade0cb262362c3e506808c532377d181de075a5974bb98cd08326b85",
+                        "s" : "0x494faac1686ca457e203fe70da2d34fa7f0568fb9bd6170e1adb70d6d99c7fb2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d137g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d137g0v0Filler.json
new file mode 100644
index 000000000..f2ecd4b79
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d137g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d137g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60896064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8a262ff43149a8c7899fb5f549ee568a9c9cee9616ef3c726caafdec1eb88771",
+                        "s" : "0x50f30c6888e0c2ce71e62e52b3fa7ab5e64342399b58686141444b5adead5e65",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1380g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1380g0v0Filler.json
new file mode 100644
index 000000000..eca3ee2e7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1380g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1380g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610564606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa11cf3f761bf7a1e5e6a3c2de67064cd93bd623028f5d296180737a86ef9e846",
+                        "s" : "0x1040597c2d80405bfc00f973ce45cc3db59baa2bbc43464f224b7d98014b14ab",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1381g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1381g0v0Filler.json
new file mode 100644
index 000000000..a35c3ff8e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1381g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1381g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610565606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xed02c8c69a7ea282dbd844f2495ddd6a9203daf022a37e2eff412a79befd705f",
+                        "s" : "0x50a400d876c0a1d7e53d76f0b87aad1cc74f592e72b0f4e46a265b69ae8cd949",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1382g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1382g0v0Filler.json
new file mode 100644
index 000000000..0fc0e0039
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1382g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1382g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610566606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2f59602596ecd4c10836fbca75d828cadf914c91529257fae3993ee8cdebdab2",
+                        "s" : "0x337e4c3529eda6f7fabe043096dedc636e7bbfa425050faa5db8455caf40971d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1383g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1383g0v0Filler.json
new file mode 100644
index 000000000..fa6af25db
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1383g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1383g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610567606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x87eae41f6ef827f21ea8ebdd554d427dbe92efc0251005a9612c05afef1c633e",
+                        "s" : "0x0e1fda433ed09afccd284f5e6780c7e4b7c27a13fd249195bfbb2e94537c8c9d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1384g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1384g0v0Filler.json
new file mode 100644
index 000000000..a8c770ef3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1384g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1384g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610568606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1901efc15e61a1f860d17eeae91bd710f5b452491948e7424d19c6ce181d83a4",
+                        "s" : "0x4db95a96a3659c7b4a3f321e7b3dc2c149097fe33885dfe2c273cd4a92628b0a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1385g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1385g0v0Filler.json
new file mode 100644
index 000000000..f8119310b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1385g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1385g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610569606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3aeb9e7b08f569340ac067d7497b813feb0c9987d390ac278b24514e33bf6333",
+                        "s" : "0x67e1e56f88bf59ddd42a1864064b4b0464bf416fbedb882c729113dc1363e309",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1386g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1386g0v0Filler.json
new file mode 100644
index 000000000..8bd5c5bfa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1386g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1386g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61056a606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe5b7c69f7dbe17962489e4b52f29aee9ca45f00b19f5a14f7156db61d03ec79a",
+                        "s" : "0x7cee5fb67bba5ed73ebd21999a885ace2d551e375f761b6ad4a9d3344609b017",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1387g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1387g0v0Filler.json
new file mode 100644
index 000000000..27a8e9fc8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1387g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1387g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61056b606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcf2832cb4ea8b13a897715d476f2779d6f3ac5bcd37fd130de0de1f30ac9d08b",
+                        "s" : "0x22bdb654d5190a110284dd0babf41be537382a566e8a7c50a2ebb926ef1ab3e5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1388g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1388g0v0Filler.json
new file mode 100644
index 000000000..05cee1af7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1388g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1388g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61056c606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x99f827a12021b4812e27d22da1d559d4cf30d4187ef5cefe76b0f1ee26189286",
+                        "s" : "0x72222198b127398d593942093b5add5869d2971603dcdb7b001bb5610cd392f4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1389g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1389g0v0Filler.json
new file mode 100644
index 000000000..170dda6d0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1389g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1389g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61056d606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe3eccb4a902cc123c877085f9d3a8bb5a0eca457000b5a759a89f4c84515292c",
+                        "s" : "0x691fa7a1b7239827176bff5946abaa6bbebf52a7ed33d19849e92c07fbe0126a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d138g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d138g0v0Filler.json
new file mode 100644
index 000000000..ed3433f86
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d138g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d138g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x608a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9456905dbef57274f86ca33d65aa1dfb0c446c861ebeae55523a9af1595607c4",
+                        "s" : "0x62ee225c2c1c93b18b72beaefc0e4b3b16e05fef9234c020b1a5963d12a15623",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1390g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1390g0v0Filler.json
new file mode 100644
index 000000000..1c288efc5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1390g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1390g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61056e606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6171c86a082aeafa70ec86ba5dc13774e1ab8c591a2f6c82c10387235d34485e",
+                        "s" : "0x56c575796f3064f71cb5f458aafb10abe9cf99bedd1f56a611eb5c8eafcc4bfa",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1391g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1391g0v0Filler.json
new file mode 100644
index 000000000..f914dc021
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1391g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1391g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61056f606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5c0a3b7dbee6b19bf13c767c02a56dad65fbcffe4f0c996c3353b71df57ca946",
+                        "s" : "0x102ad98a66b3a994e52b65420de1f4ce56c0bddae05fd11fff2e490c27a9fb75",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1392g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1392g0v0Filler.json
new file mode 100644
index 000000000..e097a66ed
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1392g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1392g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610570606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3821b4cb7cb95518e22428fb5599de6cb8a1cfca8376dc63e56fdeacd4e9c7c9",
+                        "s" : "0x2a2c57279062dd38594cf7225a0f69b3f286285fe187c3b06ee834f269fe7e43",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1393g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1393g0v0Filler.json
new file mode 100644
index 000000000..bcd46ac01
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1393g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1393g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610571606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa3d8e344a30619f4ea1ceeec818f57a803a2b96e90984cde58e22b09243acb4b",
+                        "s" : "0x67a291ad547567fb7f6bd194d88035356b7e18caaa4cee276472be88dbb66082",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1394g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1394g0v0Filler.json
new file mode 100644
index 000000000..3ccd4f2be
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1394g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1394g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610572606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3b19cbf1aca87d765df770bc46a73e203fe3713e1f46dc7c41e8261fa461e65c",
+                        "s" : "0x4833a6a3a32f840ac6b163d8bbe811c48d0af8e3fdde314c484e048ddc8e631c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1395g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1395g0v0Filler.json
new file mode 100644
index 000000000..e5355a750
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1395g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1395g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610573606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x81064e9519c524776b64e9e931402ee78232b9db12ea53fb7d0a910920732a4e",
+                        "s" : "0x6a078773b99a47b16c161c31f35b9ee4fddb96ef8dda41cd0af232d32acb0b54",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1396g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1396g0v0Filler.json
new file mode 100644
index 000000000..8c2ee12ed
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1396g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1396g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610574606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x876b4eb7384dd743dd01c08a5bc36032fa85ba0c221562ca604ba688334fa40c",
+                        "s" : "0x5ca4a9614df51a1eacaa172fd8b7f40c5f6a79cc3b9f19d761495d3fa825863c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1397g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1397g0v0Filler.json
new file mode 100644
index 000000000..a634bd868
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1397g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1397g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610575606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xec0df43c3997ad3dbf29828322a4e86835e7971ad600d99e4a61580725f8edbd",
+                        "s" : "0x3b3e956b6fe513929c235fd5f048691b962a1692ebdb5d78e1993b9aaf4c577e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1398g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1398g0v0Filler.json
new file mode 100644
index 000000000..be3982de6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1398g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1398g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610576606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x403e2ee680c81cb4ac418bf20f74a1717dc69e8bd7b2b874758712fcd912fc7a",
+                        "s" : "0x1f32ec69e0b11d3e3e13eb0a177db04f67de97c65d014ef66f2cbe5f4b935d6b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1399g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1399g0v0Filler.json
new file mode 100644
index 000000000..ae7bd1191
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1399g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1399g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610577606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x957541fa1b2958e2b4fa65555236446cf0485b92c3758f1ff059a35231f8799b",
+                        "s" : "0x74f5cb399f941d71cc269e2fe71034ab39c5e2f4ca84fc60ef6147ed3c135cda",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d139g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d139g0v0Filler.json
new file mode 100644
index 000000000..aa76f131f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d139g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d139g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x608b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa71cc03a3cea3af724cfc8106c3affc4bd478399113bb1fc49b0ff962f2c28b7",
+                        "s" : "0x16f7e0a50505d62b08912026fb026477e0d18bc89db60861520b8a78fc3b77ec",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d13g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d13g0v0Filler.json
new file mode 100644
index 000000000..c98317560
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d13g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d13g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x600d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7bb036ca00ccdd39936a0850d7a0847d019279526a66d0b5603e108b3ae23f5d",
+                        "s" : "0x599d352825a39d7588f4fc5b3ef05aa257ac103c148582e1719dc26901961082",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1400g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1400g0v0Filler.json
new file mode 100644
index 000000000..1c3616a65
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1400g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1400g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610578606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc4d222c774083dc9b8e90af13a4d6e25f77c7982773ba5d64e9b8e09ac272184",
+                        "s" : "0x53fa51eeb811708bd2c6d655015e4306e966dd82eb1edcf2a226a66c6e855122",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1401g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1401g0v0Filler.json
new file mode 100644
index 000000000..b2b95a7e5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1401g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1401g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610579606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7f9c4a57acad1779b2b9a01c8660caf8339138d45e820524ae857442b4daccec",
+                        "s" : "0x3c6724e2ada4053923cf1247bb1f4557fb804b48505edc0e41df654a3fc78320",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1402g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1402g0v0Filler.json
new file mode 100644
index 000000000..100714bfb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1402g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1402g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61057a606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x80c0a34cd8e2a7324ca41c71d42d656b370c7bc809f81946ad47d4b59414f8f5",
+                        "s" : "0x7410b88ccde15a3143c66f7811500fdb7ee888ef25e40a524c335d881d26bd1a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1403g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1403g0v0Filler.json
new file mode 100644
index 000000000..53f9741b5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1403g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1403g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61057b606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfd0c0cd448b7d4ec2b77634e2ecb44b44dd72f1bbf47dc7f2bf2e2ba21b004ff",
+                        "s" : "0x6899340d7a1f19e26598b144fae5251ba0296aa3d3429bb99456ede91ebb7ebe",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1404g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1404g0v0Filler.json
new file mode 100644
index 000000000..7db12b893
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1404g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1404g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61057c606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe45bb71521026ce3f42ac044a78342cd2faf697f5ef15935d115d7049e9363a0",
+                        "s" : "0x40883c56fbd985dcb9a947b872749ece177766d668db6267228b1c3261220eb3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1405g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1405g0v0Filler.json
new file mode 100644
index 000000000..e2f017f6a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1405g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1405g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61057d606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3f8bfa44a9c385b4247d6fb9e1de4127444e5cb32a1817fbf72f75a57c918bcf",
+                        "s" : "0x18ed7f4adb00a63ca7bfd3e3a6ed2db8db5af04dc969dd31427fe9911ea1dd6f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1406g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1406g0v0Filler.json
new file mode 100644
index 000000000..12f4805c0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1406g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1406g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61057e606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x53ae814fd925a9741729a828c461e657628072e848892936e5f6cb7a981d747e",
+                        "s" : "0x6772a65e790e64e9cb4de1ce3a40c628430833a20aea738d418bda901c15c1e3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1407g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1407g0v0Filler.json
new file mode 100644
index 000000000..0203b6829
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1407g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1407g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61057f606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa11d836f46b12ecca694cc50c70fe8985b511163a16896b0258ed53bf7dae52c",
+                        "s" : "0x7733ec4c54b81043b2e8783dee6a8b5097bf5917a62e54b8ab27e5d17b658ae8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1408g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1408g0v0Filler.json
new file mode 100644
index 000000000..d6722d9a0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1408g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1408g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610580606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa1779f5b27b5194430f4d45e1b1c86c65cddda92c713bdf426505953f806ee02",
+                        "s" : "0x7241a8da5734d161556e6ca71a9b591b31a1c06cfcd78016e23d209e2382e399",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1409g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1409g0v0Filler.json
new file mode 100644
index 000000000..f02b6da17
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1409g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1409g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610581606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf264950458d1d61850b45d70e7206e67423f0cfa3848c696774d36695605718c",
+                        "s" : "0x60b12e09240df2c770326fea60086ec18bcd07157c63f5f2da6029e319db05ca",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d140g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d140g0v0Filler.json
new file mode 100644
index 000000000..725ffd93d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d140g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d140g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x608c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3786a1f12ab7044a282e88bc52b611660021bb687ba6e56aafca06ac1b179c76",
+                        "s" : "0x0309b4fc356ba934bdf457aa3c2417d5162bc344f48c5f63314771b44978095d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1410g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1410g0v0Filler.json
new file mode 100644
index 000000000..464b2da92
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1410g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1410g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610582606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe7225c7a2fe67b21e008d24f4c6054575ec9886805be4e3cd620ee421db61174",
+                        "s" : "0x235cbf3ff660db1b716238c0b4273e19bed1d0dd5b260e9b914d66a9b6d51a56",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1411g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1411g0v0Filler.json
new file mode 100644
index 000000000..8442dea52
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1411g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1411g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610583606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4bb555f4bc15276db6bcd5143774f8633724f4c3db557d21ba10da0c8de025cc",
+                        "s" : "0x55cfe69b52d88a33bdb3180984984d2326b454c2909f6ffc7383ae08c8943e2c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1412g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1412g0v0Filler.json
new file mode 100644
index 000000000..6cc88b6b8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1412g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1412g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610584606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x689c8a3748495fc1c00f60bf8665c9f97d69c45e6eae1c7e7771a1dbb0b24950",
+                        "s" : "0x755ac23f1757260424dd052922de5aeb4d52ae907cae76c3b25c9004fa7f6d39",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1413g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1413g0v0Filler.json
new file mode 100644
index 000000000..90fc347b1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1413g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1413g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610585606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4632f8fe616c77030b939f328c5eea914c8b71a5879a271dc219ccf2321bf07a",
+                        "s" : "0x261b787186cb0c28ffc2ae9f4b290ce634c7f5581655a4184e4d822140572feb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1414g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1414g0v0Filler.json
new file mode 100644
index 000000000..6ad24f778
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1414g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1414g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610586606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x80d73f2fd05e03a1a780ee0dded0aa16125f210fd7c621607e9cf6051db48a40",
+                        "s" : "0x45de7a9dbf76c4d35a32d72e38c2f684cbd0d96b4681fc9a3061e9a48b0cc651",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1415g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1415g0v0Filler.json
new file mode 100644
index 000000000..6633953ed
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1415g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1415g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610587606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x62195737f46bda0091adbe4f9ce4200d43a5d6447fb09a69bb75728edff97bd3",
+                        "s" : "0x35cb6db7feef1d49dcfce8640e498815896b9dc7e158f35519b01079b3561b1f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1416g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1416g0v0Filler.json
new file mode 100644
index 000000000..17e14521c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1416g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1416g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610588606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x746f9d10a97ba6d13766232c25346f11d44c8a8aa727565aa04aa5ec9b8d3329",
+                        "s" : "0x0e0897d5594a8bd909cbb0ef278d506f9e6d108d1e8cd9c4900820c48f91e83e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1417g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1417g0v0Filler.json
new file mode 100644
index 000000000..a7fdb6771
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1417g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1417g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610589606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaef68226a02288505fe7a5088d901f616b4ad72c31977e0ac16ffb90206e6d73",
+                        "s" : "0x6a1734d468f06c48e341127e33fdebf2ac75350cc7be4e88b3375a1c7b3ffa0d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1418g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1418g0v0Filler.json
new file mode 100644
index 000000000..db58f33e9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1418g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1418g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61058a606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x914768684ae0448dedc582c3eaad56eab1ce2e2000a78b8c0499f24c0fa4d421",
+                        "s" : "0x195cd8c4cd4b1caebfb3905fbc000e2cf71dcdacd8d002b18a4a46896152116e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1419g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1419g0v0Filler.json
new file mode 100644
index 000000000..a278ee77d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1419g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1419g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61058b606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x370ced589a0ab1abf0c1f30509c4dfc41b3e158e66c72e32113aab9fe2da2a42",
+                        "s" : "0x6952e85d9ee14a603172244c9cfa3a084b61d9874ed1ecd8fe72578da22f68d3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d141g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d141g0v0Filler.json
new file mode 100644
index 000000000..6720a924b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d141g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d141g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x608d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd76bd510f97ed6cc4797dcfe6d8674aee2aefadc8e89dbd04bed51fae9727e31",
+                        "s" : "0x4e7374e9a5c4d0a58e4ede088f5649887bd54253ba69319d2d905ad4e7185d68",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1420g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1420g0v0Filler.json
new file mode 100644
index 000000000..f2da36a3b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1420g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1420g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61058c606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x459639a0634f5cc0c8dad477e74c093b183072a79a9977aacae6c317d30b0ebe",
+                        "s" : "0x2e0bacf774c7bfbc6a05b7370ca59f997d634ef26e0bcff141ba3bced08bf63c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1421g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1421g0v0Filler.json
new file mode 100644
index 000000000..669bbed40
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1421g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1421g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61058d606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3d74428f780a42cdce5251b2b587dac58d8ebfed08409c24990a3780114ff25b",
+                        "s" : "0x07e527b355eaaf8ba1b8b772a393409dd69d1eef221cf303977098e7b556ad6a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1422g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1422g0v0Filler.json
new file mode 100644
index 000000000..a59d0d48e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1422g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1422g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61058e606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x01cd4825c0d48a945ae5ac75a7836e1cad05a5af5d0fbdc89234d3980d00f158",
+                        "s" : "0x2955a4567e9ca258504aa6e010e276ab4b330976659c7af4c4c73ee78a17b22e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1423g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1423g0v0Filler.json
new file mode 100644
index 000000000..edb064416
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1423g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1423g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61058f606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4813c9ae0fa531a2c765cdb7649e7dae9a067ae15a4ebdb976a4db761a07081e",
+                        "s" : "0x15184a8ac72e093b31bdd6a70877d0689c09f3e336766e5f2eab4b26bf9e6953",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1424g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1424g0v0Filler.json
new file mode 100644
index 000000000..cffbb0cd3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1424g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1424g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610590606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x409138e17173aa863ba719db4def3ec38594ff804a30db4c56c2715cc4ada353",
+                        "s" : "0x24d581d8d676abe0a62d3dd7787b67d9944a01a08dc230d69b3459d1bd1e42f1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1425g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1425g0v0Filler.json
new file mode 100644
index 000000000..9d31d86ac
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1425g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1425g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610591606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x59d8b765ac806d9680893638e690640de96137c0299e3363026e742f05031898",
+                        "s" : "0x7aee5c56e5bdcfbf2ee8c9fe7f002bffee2b138f0d582ed8b84c78f2faeac392",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1426g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1426g0v0Filler.json
new file mode 100644
index 000000000..fb29e8aa8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1426g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1426g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610592606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd717944e5e11dd48f1cdd831ca7a8c75590b6caa09cf7df43c595dcd1dc84ecb",
+                        "s" : "0x0e2527145eb9b5af939dc3c80c218d9cd818cd4dcee7142cb480b260a30a892c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1427g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1427g0v0Filler.json
new file mode 100644
index 000000000..01223fbf7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1427g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1427g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610593606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x62cccc474310bd2dc8934f63998392f22bfb97e53877194abe789bffb27f60da",
+                        "s" : "0x3e70b710509d51de014b0b6c64bc059b6b879a1595fdca5ba4a85ed091650977",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1428g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1428g0v0Filler.json
new file mode 100644
index 000000000..b967b4012
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1428g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1428g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610594606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf8afe8938eba5d45e73c2fcd5dd67bccf0024a6c1ebaa03de6c014a29c67ec71",
+                        "s" : "0x35efe74533d4a1c3a149b6ce5e59501472a441e495e4edd28a3fbe1d2cd6f6ae",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1429g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1429g0v0Filler.json
new file mode 100644
index 000000000..54d64e5d2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1429g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1429g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610595606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xabae7da28b52dfbc538a16c13211028c06506f135a6264b07346e60216c46022",
+                        "s" : "0x3bc84aa84925ff31cb2a3c684b7216ddb7878759dc7ba6f6357a6c53648fe4a5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d142g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d142g0v0Filler.json
new file mode 100644
index 000000000..dfe129e98
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d142g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d142g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x608e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb572df9d2dfdf2e25d4f8222049b90639a860391520a5cbc6443fce911495a2e",
+                        "s" : "0x563cb19c4139fdd23539b5fb971b3f1dbb3c96b01246b3e24953b6e6babef043",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1430g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1430g0v0Filler.json
new file mode 100644
index 000000000..8e9029c12
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1430g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1430g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610596606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfe870cc33fbaba18d03cf54d689a344f89b9d5eb10e8daacf02313d53acc27d8",
+                        "s" : "0x068564dc08bd3dc29b40159f7ae9b06930d635e1e5deccbe446486478bcaa90b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1431g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1431g0v0Filler.json
new file mode 100644
index 000000000..b87a5fde2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1431g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1431g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610597606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1668b9767d83680a73920512e00faf5614fb624e8e2ef51ecf84df5e04c6b6cd",
+                        "s" : "0x1436a5b39edce53e76e65a2f99e1584fba65364506cf56c40fdc7bb5d08dd121",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1432g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1432g0v0Filler.json
new file mode 100644
index 000000000..3a8adb5d3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1432g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1432g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610598606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x15657acff3a40bc5c18ff3102165c132e8db9aa16face5291db6a462de79fa59",
+                        "s" : "0x0f5b462420033eb79d7d664a97fceb3ac1724bbf0d241dfe9ec146a5a3907d45",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1433g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1433g0v0Filler.json
new file mode 100644
index 000000000..763bf7d9f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1433g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1433g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610599606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaad9dfdd519487795eb20fd8a4ef082b284898dcb8e4d437978d154516175ec9",
+                        "s" : "0x724e1ff1e417672090710c6e7c31ae0fd1ecd25a09f417a05337cdc0ff78c651",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1434g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1434g0v0Filler.json
new file mode 100644
index 000000000..a5b07a025
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1434g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1434g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61059a606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x828e188c80e99f82cbdb7816e10b2a3f817009382901ab52431b71aaeb0bfc9b",
+                        "s" : "0x612d9c556d9176cdcf0aabadba5899bcc8f9aca5e2889dd93e463459ba28c155",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1435g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1435g0v0Filler.json
new file mode 100644
index 000000000..d1fe47146
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1435g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1435g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61059b606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdcf0943e831c0ae50fc34b5415cbaac810bfbbe722ece183047f67ceb82a2251",
+                        "s" : "0x4d849d753e0b954dd61f603a2b98e0ca0ed1cfd873deb8279f01c161f73a8086",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1436g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1436g0v0Filler.json
new file mode 100644
index 000000000..27936a1da
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1436g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1436g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61059c606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x09c2c0e18f261e92f1f0edd90899e3ee3f4b17d3aa65e800e28988562128407b",
+                        "s" : "0x41ecae4fa6c669d43cf87c2954af4e01ed97e7424fddfa85b28ec1a55f261bc7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1437g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1437g0v0Filler.json
new file mode 100644
index 000000000..89429bb8a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1437g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1437g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61059d606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe817d21c0c0efc53718e927e23e517fcf9b1dd6cbae1b57ad5cd7eccac2ae201",
+                        "s" : "0x06ffef2e85a4a297f6d9bdb681f00d54f6aa76980023d21dfcc18df334fdc742",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1438g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1438g0v0Filler.json
new file mode 100644
index 000000000..e903cf504
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1438g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1438g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61059e606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x55cbb4bcc401e3d64413e9e5632d839a370598c43fc755c15a4f68ba3ad2eac2",
+                        "s" : "0x15f6db016296e979e10d690afe600aa78222583a0b030b9f2a942e55d3b4c022",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1439g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1439g0v0Filler.json
new file mode 100644
index 000000000..ad7290860
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1439g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1439g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61059f606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf5d877360aeacb9ee91309937a42c8d2c26854fd7b3f65c87ce4419df5d45b2a",
+                        "s" : "0x4d9dd3c15b1add4080cf31c540e8f9e796d4f2c3125fb7d2528e72614f04afb4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d143g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d143g0v0Filler.json
new file mode 100644
index 000000000..75a36e44f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d143g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d143g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x608f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb286dd0c199fac7b1e383b1a41c4be8d2a9e7ba6a943fbfb9e53518f10898bf1",
+                        "s" : "0x5276683dcf3afad5ebd2731d8d2eeef8532ea8d4f4edd21a122baaeb65e0b901",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1440g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1440g0v0Filler.json
new file mode 100644
index 000000000..73c776e5c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1440g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1440g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105a0606452600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x70235b2e656e97b562c6caea40ce09bf6a284cdeeefbcbe39a8f1333017bb211",
+                        "s" : "0x51009e2a2d5e1ba49ee0023e9d6c2e3c0720ec6deaa1ff303f7a36b141e675aa",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1441g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1441g0v0Filler.json
new file mode 100644
index 000000000..37af24bd1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1441g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1441g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105a1606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xea7d7d5fd34d8666f18d2d7a599e2cf583272dc99b84b84cbe53d5f30bb5d338",
+                        "s" : "0x45e7d291aa4f1a546994d9842575d90074e9fd5a9f9ffce89bb6620ff44a6809",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1442g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1442g0v0Filler.json
new file mode 100644
index 000000000..6f708d799
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1442g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1442g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105a2606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x149c4b39b10751f870d427f50d787af78663a2e1104482b8df74fdbf5c806525",
+                        "s" : "0x0832d55addca4bc82dfbb76d2a3504f4c86465bd96eb7c0546ad776e0f708768",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1443g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1443g0v0Filler.json
new file mode 100644
index 000000000..04cb36b31
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1443g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1443g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105a3606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa56a3e88991514f8ea0fd0a77c32ab5d4c0895ea741f7d8ac528980372ea3926",
+                        "s" : "0x34af70c9d7f671921f10a2b874d32aa8a1ecc31ab01e706a89b78dd2620f1672",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1444g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1444g0v0Filler.json
new file mode 100644
index 000000000..be54ea735
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1444g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1444g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105a4606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x61479dda8d04e044d53fcfbf36bbd533cebbf7b8d05836908aa4e8fb5f48a22d",
+                        "s" : "0x20a885dfaf9cd81a40e5611e051aee0ee7d4941bd2b5135459d423e12561e702",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1445g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1445g0v0Filler.json
new file mode 100644
index 000000000..cb56bd32c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1445g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1445g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105a5606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8e0ba5f76b0beefffa7efe1ef89c1fcd1e34535986042e5333aa0f0fe6e94be1",
+                        "s" : "0x75878c7f4788554dbfdadfd68702eab0a71348ab57fa51bfa49bf849bbe6c62b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1446g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1446g0v0Filler.json
new file mode 100644
index 000000000..ed7e03812
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1446g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1446g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105a6606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5eb653ff0de6580d784c2d34fb61f2359f25b8d48126816113ad2e262ae3ae19",
+                        "s" : "0x25e92908133331599bab55f5f837c519196879a23feac2689a0cbe9f55f82a5a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1447g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1447g0v0Filler.json
new file mode 100644
index 000000000..08fc33bdc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1447g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1447g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105a7606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x25156d6afc9c02b98e14f0db2e4955c6df3e13c590b3e6bc656291573634f357",
+                        "s" : "0x27bf189ed7b1e09118b91b9ddfb83a262517498bbcea3b50e2ef13ef04ae3114",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1448g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1448g0v0Filler.json
new file mode 100644
index 000000000..15ad65fd8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1448g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1448g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105a8606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7ac4fe727951619946e7028a741bc9b7435d95ce333e1f50056a38cf74ac21e0",
+                        "s" : "0x4d65bd419427eb12cebb9846a96d3b454308e23310dfc58a73d4fa8125c45bb2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1449g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1449g0v0Filler.json
new file mode 100644
index 000000000..c3eed6c6c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1449g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1449g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105a9606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd21db7f6454c54f5b647b5c1d9e83e5fe48ded55c7157e08d0ed8e69fcc932d3",
+                        "s" : "0x5b956214dc6545d0857c336829ebdb51ef137e1f6a9c68fed0b053e9d52fc292",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d144g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d144g0v0Filler.json
new file mode 100644
index 000000000..f42afa43a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d144g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d144g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60906064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x13917d0aadb58f9d282e82d66f92a6263a44f643ae0a485ddff0fd92702257ee",
+                        "s" : "0x042e1ebb20042ab2cfff928f4ef55949dc546e0928d5aa83f4d192e2152dde85",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1450g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1450g0v0Filler.json
new file mode 100644
index 000000000..f86644f5b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1450g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1450g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105aa606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x992736eb906bc646b5a3b38ab89a422229d640d436e609c76e20fa71607a158b",
+                        "s" : "0x66fe7af8893a867ce86ce5acb65ab57a6315e182c90ad69fe02eba1c29a6dce9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1451g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1451g0v0Filler.json
new file mode 100644
index 000000000..5df8249da
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1451g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1451g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ab606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0a11c1a0bbecc2a709a2957fa92cdef984118b3b1bc90bd59812273fcfc39e50",
+                        "s" : "0x46369adcae79445a8bae78ae44db63f418e71959760e7e35adf6d908a290b03a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1452g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1452g0v0Filler.json
new file mode 100644
index 000000000..b1fe345fa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1452g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1452g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ac606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6cc1fd99136f2987977da850fd5bab84410054b6473aeb4b80b37701a62af46f",
+                        "s" : "0x538f5e6982a8b364f54ee15e676d9ac763665cbab44a9561704f64b0440bdf77",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1453g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1453g0v0Filler.json
new file mode 100644
index 000000000..f3cd450af
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1453g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1453g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ad606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe63652ed30434cbd0e259cc27d673a6657fe516761ea56f86a2559ae0c168bb7",
+                        "s" : "0x3837b4b033951ca0f057c2ad346ff636b0515718d2323f4647a451c90d96c3f3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1454g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1454g0v0Filler.json
new file mode 100644
index 000000000..7763bd0a7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1454g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1454g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ae606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x81c4130b9a7af9c233f3aa9fd223331afd498ea26e44ba2e6ebc3389f69d6130",
+                        "s" : "0x159f316845717cdb048ce6e13ef5caed9dc01e2f15b4c6962de875c61c83cce8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1455g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1455g0v0Filler.json
new file mode 100644
index 000000000..851588ab1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1455g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1455g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105af606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc3fd8696baea05a928022e64426e85344ee719a3a96bf08424fdce9c5a810cdb",
+                        "s" : "0x6b9d8c977d4a4f3f2c9797a357763c58d81981ce7f939f69ad443abedfbc6989",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1456g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1456g0v0Filler.json
new file mode 100644
index 000000000..478927c8b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1456g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1456g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105b0606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x19ff09d6d69c4ea4979c26b7b78033a1acfd3253604163d6137775ba2b864ce8",
+                        "s" : "0x3fc41a5e68a9473b1ce8dc6a769563eaadda3ac0f3bf38dc2c252ed5028dccc4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1457g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1457g0v0Filler.json
new file mode 100644
index 000000000..312da565a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1457g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1457g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105b1606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x64adb1163a1abc0800b26ffe1af4ee8e8f9b642ad6bcdf1e08e50525b944cb22",
+                        "s" : "0x77ef24f4b7d0ac97c79a1b8d353d50dce39d6c122b3481f6a2b42980a70e9f99",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1458g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1458g0v0Filler.json
new file mode 100644
index 000000000..5c735092e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1458g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1458g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105b2606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb72b2ea6bf06c28f78e481386eb0af36dddd86f6f983d3aeba75bde82e8a98ab",
+                        "s" : "0x0fdaf04468047a47f79cb3a840159b895d3a6f7d973286732f22c11c11cb9a37",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1459g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1459g0v0Filler.json
new file mode 100644
index 000000000..f8f91512f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1459g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1459g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105b3606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xce367748a31e1e76fd7647a7771345aa9d8458f4437ebb29783d44ccb31c7c76",
+                        "s" : "0x571a5d6829a6d6dba3a0c3740d5f62aa857607f9218e8d5b21c1e2e69c3e13c4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d145g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d145g0v0Filler.json
new file mode 100644
index 000000000..0820b4975
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d145g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d145g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60916064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc4f31cad5341a9aaf68b5d5396a0999674940651b340ed9090c626363512b22",
+                        "s" : "0x371bb3a1c8e3625fd22104e2239068670caf49c7478b43eb640485a667355135",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1460g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1460g0v0Filler.json
new file mode 100644
index 000000000..3f12bc254
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1460g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1460g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105b4606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcb55ff1b91e6445f0bf5fcd3253e3238a1c858b5b34cd0cbe25de6813b8047f0",
+                        "s" : "0x7334ccc5bdd680668a5e5fa115369157b6ed1f030fabd77ff7d597468b643b53",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1461g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1461g0v0Filler.json
new file mode 100644
index 000000000..cdd616eb7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1461g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1461g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105b5606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdd4b17e1643aa8ce3185a7dd23aa56b8cad46dbe8ca15c9d5b94462ffd4917a5",
+                        "s" : "0x30320d7dc4b6340701f0b6047a83601d6db822c4b20e667345518170d913576f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1462g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1462g0v0Filler.json
new file mode 100644
index 000000000..319f2f1d6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1462g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1462g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105b6606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x65b28515ab4bae6efd4a14147cf0cac83c6efeaadc93adab9a0184eff7e36922",
+                        "s" : "0x368df77766ff1e747f9fad9d81c2e9de5be168ddc06d6fabcd0e299238810d21",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1463g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1463g0v0Filler.json
new file mode 100644
index 000000000..6878ceba1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1463g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1463g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105b7606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc1f103d6b7220472d8a032af8cbb31714871595405d8017440ef44eb9f2d302f",
+                        "s" : "0x4321e0da6e00d691a37d440e9ef4d299aacb0892cfe763e4b1cd40d500256b6a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1464g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1464g0v0Filler.json
new file mode 100644
index 000000000..546ca29cc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1464g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1464g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105b8606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfd473fd0eb7edaa52a49802475cb8f5b947ad568544d491e031dc7df89cc4bce",
+                        "s" : "0x0d465fb29d7082fa24fdd66258f1bca7cb3407abefb95e6ed1a0d70c312ed253",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1465g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1465g0v0Filler.json
new file mode 100644
index 000000000..a69c5c31e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1465g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1465g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105b9606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2b07ee4eb6046e6396ae876f810d0c268a8cf7152736f816c326b7cb0532e3b5",
+                        "s" : "0x1db69c40bae421c176fbcc3de8277aaa599a9d4a6e14a1a06a9c375d80172605",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1466g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1466g0v0Filler.json
new file mode 100644
index 000000000..8c2d12edc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1466g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1466g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ba606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfa7c8618e37bff1045e5bb42280dd80a3aab52de16e295c0fd4dab697b0813dd",
+                        "s" : "0x363d010eb133a05f10d73551f02cf3a2eaaf71aadd38a4a90da22193d87dc197",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1467g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1467g0v0Filler.json
new file mode 100644
index 000000000..85c0f10f8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1467g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1467g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105bb606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x56ba2a872add50d2c0dc10d02c7bc1506311fed668472f7b24d63295d1cb5c26",
+                        "s" : "0x45b19e73ada50fc0096dd07a7e1b79d19439c5e93d8c9ec9c252a54d6f748e91",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1468g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1468g0v0Filler.json
new file mode 100644
index 000000000..a8eed0d5a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1468g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1468g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105bc606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb3a12485fd9634223fd4eddae5e14a74c054effd374c1ca9809c379824688d7e",
+                        "s" : "0x6ca43485b13111efee094cd9285d04c84281239dad39eaee3f44993612cc5356",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1469g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1469g0v0Filler.json
new file mode 100644
index 000000000..fa6c7dee8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1469g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1469g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105bd606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x581053669a923e9dc55e2bd97cab8e984e5e911a372d30a00ed9d0a81f35c198",
+                        "s" : "0x0e91d0693211da30a92da0c1abd7a281b111ad6ab6eb2506b36eb9191c347709",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d146g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d146g0v0Filler.json
new file mode 100644
index 000000000..a3dcd4fd2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d146g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d146g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60926064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2dfa2e1f904fb49e64e165bd83038b434eb324e6c973a16e53772ff18bdc1b85",
+                        "s" : "0x79731bf0b32b489063971dd0d2a152fd3bfaf5d162603ef8f2b9702a193e4922",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1470g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1470g0v0Filler.json
new file mode 100644
index 000000000..8d87df65b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1470g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1470g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105be606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8860082c8ab87bb52c5b0d2fb1942f5e150f7b31aad47a93484812b3cc568f40",
+                        "s" : "0x41e81f16dfa09c42e9ad99b47974baed45589645aeb5324169afc4f55ce2aa42",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1471g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1471g0v0Filler.json
new file mode 100644
index 000000000..0f4060e4b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1471g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1471g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105bf606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x33b9c8f19fc342601190750ec26dc7ec0e3b39140513d52536ae0608e6be9f68",
+                        "s" : "0x1750ff67da542db213b1fe463c49d14e11a5cd3ff3eaa03c7ad49fcb0fc90940",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1472g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1472g0v0Filler.json
new file mode 100644
index 000000000..d364f2640
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1472g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1472g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105c0606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd8e513a1861643a5693ab4dd94a1b952df02f88fb0ed9297e30fdf083e6da818",
+                        "s" : "0x0fcdcf7ddbd3606b1883d2327b802a31407da9b487c0547ae3fc1babdf712544",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1473g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1473g0v0Filler.json
new file mode 100644
index 000000000..a8bcd23f7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1473g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1473g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105c1606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6efa82f6aeb8add7ef8aece60ae189d6159d5808a796645b6b3fef3c839bb0d6",
+                        "s" : "0x3d11da2cc366468ed3c1d9c33e01ae6935323aeae18b4ed5166efedc6de587b9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1474g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1474g0v0Filler.json
new file mode 100644
index 000000000..81f437303
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1474g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1474g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105c2606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbd03344773b4f63c7a894c9630707dad1fc53942e942abff1492f457bb5ca9ef",
+                        "s" : "0x0cf69a15eea513dc19424803527030af961b6b61b174a69a5d9c6c4cfd612e81",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1475g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1475g0v0Filler.json
new file mode 100644
index 000000000..6288fdf27
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1475g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1475g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105c3606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x04ed0f7e544a28ffc969290c36f27c6f9251aeff37425193024eb8e170c09d05",
+                        "s" : "0x3f469df35d89253eaf39660f37e913022ef334b579ea106256feb08e15d67a1d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1476g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1476g0v0Filler.json
new file mode 100644
index 000000000..61de34985
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1476g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1476g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105c4606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x427f6dc96eb36bfd73d20059336145350f26e0866a2a434322459926f12fd30e",
+                        "s" : "0x6303f4b5079100ddcc931eef59871cc9152272035072f5087ca5f8c28d66c48e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1477g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1477g0v0Filler.json
new file mode 100644
index 000000000..89c9c27e8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1477g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1477g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105c5606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x07f1bc3513b803df9afd4fb9ab34e6141fe2206c29fca3efa735f5665d0f5b54",
+                        "s" : "0x70ccbd8e0c74b18e98619bb90d46f76af05de1e6bd05608f61ef82f07067889f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1478g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1478g0v0Filler.json
new file mode 100644
index 000000000..e184c805d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1478g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1478g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105c6606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xda3f96cfa4e79947c1fb1ba6e4b915134c10863e638dcd71c615e8975f1e98b1",
+                        "s" : "0x714e5acc77a15eb253939c8d84e2ef660e229d8178aa68bf98b0a6f9868df5b0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1479g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1479g0v0Filler.json
new file mode 100644
index 000000000..4426b4361
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1479g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1479g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105c7606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa99668185d11e58fd4d1c8d9cc8c52fcdf344329fc281cd9b0a0485a798574a7",
+                        "s" : "0x4b4035ecdda05716ef150960ed71aecafb5148e706250bd8181b83fb5a4e5810",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d147g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d147g0v0Filler.json
new file mode 100644
index 000000000..748914070
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d147g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d147g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60936064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbb4490bec100fa7ac3db315a69845f7066640cbe49316de660b8f5f3e6e4d82a",
+                        "s" : "0x63bafa9c32287fa23a514e7d2527499c5fadcc6d9b4fa181d679b45c6b535785",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1480g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1480g0v0Filler.json
new file mode 100644
index 000000000..0ed41b820
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1480g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1480g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105c8606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x252b1123faf06567b4bd66724f8591e4e896090cb433154bf29c41ed27af395f",
+                        "s" : "0x4e267c4584240af5bfecc33d62bcc0576f098730e988be99526089d24f2cb7cd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1481g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1481g0v0Filler.json
new file mode 100644
index 000000000..b4ce3e90c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1481g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1481g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105c9606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x619bf91d45fe1484371acb3c6f6b1b749afb45d761a93ec3c898a7da4f9d9d71",
+                        "s" : "0x31eeb882fd9e34803b21b4d96c6b61aa11a16c66a733e170ed25cc6dedbddf65",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1482g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1482g0v0Filler.json
new file mode 100644
index 000000000..c88ce3d1f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1482g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1482g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ca606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3d9672e866439ec0df533e0a30dd694569942e9da0fddb3b703aaf502678c525",
+                        "s" : "0x26809fb90de44de4923f8eab40f68acb616ccd9fc422eecf180df79d6c36bb08",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1483g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1483g0v0Filler.json
new file mode 100644
index 000000000..536b47bfb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1483g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1483g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105cb606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5909b45aad8ef9231eb4f4a7c9236972a404e4361317bf709ba0fd21bf4e58d7",
+                        "s" : "0x0fa335fd6b9e0abc1ad55442bcc9d2aa3fedd45dbbce801ec7f5da1a16cb8f59",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1484g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1484g0v0Filler.json
new file mode 100644
index 000000000..808b33fce
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1484g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1484g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105cc606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x79b39f061fbf2e87c8347f8e16e186d73900b3b1504c2c54ce76fa6bae39e67c",
+                        "s" : "0x19729291bd0415984f5da4d975834a92dd3d35c67da667e60b67385130514fb9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1485g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1485g0v0Filler.json
new file mode 100644
index 000000000..0d2d36f4c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1485g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1485g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105cd606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4abdebf0f8793417015723f88986566183289918a0befbb612a93fd13154cc06",
+                        "s" : "0x242cfaeabc4e580c249a248b77a74cf9af25bf1e89a2cff3f10f665bd1242faf",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1486g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1486g0v0Filler.json
new file mode 100644
index 000000000..abf8688ef
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1486g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1486g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ce606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9daa69dda8c664bb4428f75ebad92c503beadc71bd21f273a2d0d6978bf32f51",
+                        "s" : "0x7a5825119496e664b89bcb29d09ddecb3633bd4bc91ac8367366b76e0e53d189",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1487g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1487g0v0Filler.json
new file mode 100644
index 000000000..b75f941da
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1487g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1487g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105cf606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6dabc5c4264504d23313b25b48382e8998b1503c8b36331b98a0934f3e6e2864",
+                        "s" : "0x749ceb52a140fdee7a638b136f8e09cbc8ec1a0bba248cd684b59d0d913b5866",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1488g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1488g0v0Filler.json
new file mode 100644
index 000000000..7c4145fa9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1488g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1488g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105d0606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5b4ffe5b8eac643d796d1c92b23f533a080867df78528fd9da446333f0e3233e",
+                        "s" : "0x700d01d0fcb8001608eec2b5fe7f88e81f771870ff18f09cbfe680140a9554ec",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1489g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1489g0v0Filler.json
new file mode 100644
index 000000000..c67e54587
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1489g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1489g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105d1606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xef00fcfe7e945ad1bf82a96600b63aee84b6bc00489f80f7137c40c874e6a658",
+                        "s" : "0x662fff01957a1dfd2ddb5760937fb381b21ebc9e6178fe5fa6a293092265118c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d148g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d148g0v0Filler.json
new file mode 100644
index 000000000..7fed49020
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d148g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d148g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60946064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d9f25f3f0b2a65bb323b04aa8f35bc7e19ccdcd86483390f058f4f637f0f05c",
+                        "s" : "0x0dd4585a8678fe9efe3d2b449a1b5e6b91d0e321a4780cf3c31a28bcb3900730",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1490g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1490g0v0Filler.json
new file mode 100644
index 000000000..b54f4f0c2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1490g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1490g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105d2606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc63b1668f17cac5a5452507a57079f3af84957adabe6550db1c88342b00f67ec",
+                        "s" : "0x1dd7be0be2928e4f3dea16ae7ec88fda0a1d5c156cdb2a95262619a71a9c36fe",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1491g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1491g0v0Filler.json
new file mode 100644
index 000000000..ef10aeba5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1491g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1491g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105d3606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcc4847c8a05b04590b054c2ee99dc7ae4799474e8cfa328a2d8827cff1f2d915",
+                        "s" : "0x24e07dfe4347f5d2960905c2bba66482bd2cbf4098051dcf0f12fc1a28181ea7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1492g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1492g0v0Filler.json
new file mode 100644
index 000000000..d2876f084
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1492g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1492g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105d4606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x27f39c60d0ea8196e6a7fc49db85856d0375eb9078d333d0bd978e2a00858665",
+                        "s" : "0x73aab90c7dbb6955a0d6ee018b6f0f9d69de4e059e50166b15258486e5968c0e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1493g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1493g0v0Filler.json
new file mode 100644
index 000000000..e08c8eaca
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1493g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1493g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105d5606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x519ee80eaf4ffc349ae51d10dfcf1bfe8db1756a9518d72a41383123e18549e9",
+                        "s" : "0x212d9eb29b2032e67cbec5a69fd13f09451f123263d8c2c4b3b5ca8a55b021d2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1494g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1494g0v0Filler.json
new file mode 100644
index 000000000..a47ef1b44
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1494g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1494g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105d6606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x56480ae0f5d7cd3edbaa17d0e36ae1efaf656a0df114e1146845837e89c139b6",
+                        "s" : "0x1da897bbfc7a9eb20f384bb9eb1a17866fd7fb9b3f7ba3447f1fceff7f11fc67",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1495g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1495g0v0Filler.json
new file mode 100644
index 000000000..212078987
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1495g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1495g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105d7606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2c2ada42eea2dad12cace0e5fedf7dfc447e3c44a8d23e4ff56c15e27072c674",
+                        "s" : "0x49c0a4540a39148517e6982ecc39304ef4771338b636dae884f2617bfb9d0616",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1496g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1496g0v0Filler.json
new file mode 100644
index 000000000..3617e5224
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1496g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1496g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105d8606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x507804c91bcc8b51ab6caeb9ba32b71c8c90a5f516f2e79b60e638ccce236cb7",
+                        "s" : "0x3b8fe367a3a23abd90af5149389d988cf0b868284e53703c505c28d309aa68cd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1497g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1497g0v0Filler.json
new file mode 100644
index 000000000..0f0262c60
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1497g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1497g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105d9606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd012010c7020a3e7a6fc701e40a16c5093fb922cab0b71a0590d967a1f71e7c9",
+                        "s" : "0x13e3b95d2ef8a45e9eb94e10b20d65e8077bd2cc1b99b6bc2ec8e4bde98a0a26",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1498g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1498g0v0Filler.json
new file mode 100644
index 000000000..67487d4e2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1498g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1498g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105da606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9588599ae33eb24167f1b79f534fc44c6f2ac8ebed8c3c7f6b392272f7386782",
+                        "s" : "0x5759d2e4aef7541c274a48d6b10b00c33f2a0a1c6bbc436028018f5d27834617",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1499g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1499g0v0Filler.json
new file mode 100644
index 000000000..69e0c9322
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1499g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1499g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105db606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1d70f5064905f3b7a0087168d6c160d67a68a368b0a2eeabdef5b456ac415c78",
+                        "s" : "0x2eddee8956e6d17a2ed2a28648090ca89c9ad765ef6cccfa11ec3e884532e79b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d149g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d149g0v0Filler.json
new file mode 100644
index 000000000..65049ab75
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d149g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d149g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60956064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xae1d8ce64cf2b0e9d322ca006a2708766e7adab91713ab9d3f9766d6273a1585",
+                        "s" : "0x4e5902644bfcadf29d9981d05e40e62de1329c70caa97bbfc090b4eb20c2b86a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d14g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d14g0v0Filler.json
new file mode 100644
index 000000000..630cd341a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d14g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d14g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x600e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8ec2a217867929b5f28101d3e862043f0042df3f37a590b45570b3a2cb6ae494",
+                        "s" : "0x1c1f0fa2adb134937dfe4b659c675beeacdacc7d0039d2c9d94b1e2f9bf0d4a5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1500g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1500g0v0Filler.json
new file mode 100644
index 000000000..d0cfa90bc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1500g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1500g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105dc606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcabe539a3118e47af94b1015373202db9216105aad2bb977e7be3ee3cdd83425",
+                        "s" : "0x37bac42732230033712e7e227f5b39db31a8d0ce6100ab4429986a4d3caa1d86",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1501g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1501g0v0Filler.json
new file mode 100644
index 000000000..9050779ca
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1501g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1501g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105dd606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x89c857815c72404023f4f5215f3cfc00cb084783062414ae7689b81eac088e0d",
+                        "s" : "0x2306e838992a0243936f0d2c697e4e27c304d6f04c314ce171b809923d832bd4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1502g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1502g0v0Filler.json
new file mode 100644
index 000000000..40a547ccb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1502g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1502g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105de606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2c63d83e977003b4438b1a0aa38ee5acdb5ef839b585685855ddd07f48ecf4bc",
+                        "s" : "0x270cdfbea5f1136cc9d48e75701f0b78f069fdc1eb32832b47a015d4ca97d2b4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1503g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1503g0v0Filler.json
new file mode 100644
index 000000000..8b42c1c01
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1503g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1503g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105df606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x94b7a06b2c5a7558c570898002bc45d5446bdde3ca6840d6cd1bf41723edba5e",
+                        "s" : "0x15d3f1fe4d72714ed327efabac150af2ea81c10d7ee5e5aa011dd04908f764ff",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1504g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1504g0v0Filler.json
new file mode 100644
index 000000000..2389686ba
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1504g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1504g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105e0606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x28922f47129422855fb06689e26575eb9d85b6e0cb13ac15a922270097654337",
+                        "s" : "0x76e7aef6b61f83af6a0cbb0ed84fe6c84fc300c5189f5889b49fee5986d8aa42",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1505g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1505g0v0Filler.json
new file mode 100644
index 000000000..5364033b9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1505g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1505g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105e1606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8be33b92d8636836d3957c50a5ddfa890b5c33d1b7ce16509025378b00ff3c47",
+                        "s" : "0x521398d029f27125077e28d00f16cb83d852cf2ae9731309bbf4d7d93319a3be",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1506g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1506g0v0Filler.json
new file mode 100644
index 000000000..2253cf25a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1506g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1506g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105e2606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5fbcd4e13d3c4a53ca63b1560538712e9abc64bd586ce024fef70bad9caa346b",
+                        "s" : "0x7fee40ec6119bfec9d001d52c63ae546fc6c81a791033b296fc6083b27bc11dc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1507g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1507g0v0Filler.json
new file mode 100644
index 000000000..282537718
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1507g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1507g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105e3606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc6cb66f632c0fdecc6fd9b59ea9e2387c28df901e20bba14b5b5cff6bc69630e",
+                        "s" : "0x2151c5afbb02665dfaad18bd1f577e11e6c2c71c38c574a844dfcc393d502a46",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1508g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1508g0v0Filler.json
new file mode 100644
index 000000000..7fb78f4b2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1508g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1508g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105e4606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x789d8cd62b2421df6bbae7fd9ec9e9e9015f0f033ee7ef9eff0479be832e143b",
+                        "s" : "0x5f809a55428444c931e934949fa406c16b388b2970757e948e51e89b541f9180",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1509g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1509g0v0Filler.json
new file mode 100644
index 000000000..016f315da
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1509g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1509g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105e5606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc4671b3735780f878935bf2fd10a916d9e3060e467cf8e72c49916c867717b52",
+                        "s" : "0x6fd3031d6fe9bfc49b1adcb5fcbd29fc6becbb3a58b589ec14bc38bd4dfe57a7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d150g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d150g0v0Filler.json
new file mode 100644
index 000000000..a45f2feb7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d150g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d150g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60966064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3b2030174d367e4dd79cc2fe21b7a5c3421f5df70e4db83ea71d703f11f8c996",
+                        "s" : "0x58a7af122a3158f37275ebebface8dcc76981e915a61488f874c378f0144aaac",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1510g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1510g0v0Filler.json
new file mode 100644
index 000000000..ebad836e8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1510g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1510g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105e6606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeca0dbca7326245c779fb0fb762113174d2acb981918c91b2db42ddb6d4eae89",
+                        "s" : "0x382159bc77aa9838633cd1a4a0c2fd57d64ecea93495b4d1313c353382fe7ae7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1511g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1511g0v0Filler.json
new file mode 100644
index 000000000..63031fee5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1511g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1511g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105e7606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x630591615004237859b16e639becc3bf6e39354a2fc78f6c8780942f29b762c0",
+                        "s" : "0x24a8ba0f6fe9872aa86f18cf22052fcb1cec97191ab179923e982f4a8f6ee69e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1512g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1512g0v0Filler.json
new file mode 100644
index 000000000..cccd36d84
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1512g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1512g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105e8606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x384324a68dcbcfaff0baca77410182ba3fa8604b79d3e70346a718211387742a",
+                        "s" : "0x20365cf2c4bda4a5cef0f3ddcc5c6a37e637453ace14705183e5bb3436e073de",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1513g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1513g0v0Filler.json
new file mode 100644
index 000000000..854cffdbd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1513g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1513g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105e9606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xecc65a8ee30c73a0064a86b3bcb35f05f5024e6e5124876d257ba5b34231610c",
+                        "s" : "0x364445f22552eb9838ef7ca088489d1e84f07834d114490c3870ec46577d14b3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1514g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1514g0v0Filler.json
new file mode 100644
index 000000000..96c49bb8f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1514g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1514g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ea606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x04189664dd90bb019a4f6359c7798ec4ba40386cacc730efafefe40b132e0e85",
+                        "s" : "0x66466e1719930bfca6deab7ed435a61dff8708281b42e89fd81ecb7206a63ccb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1515g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1515g0v0Filler.json
new file mode 100644
index 000000000..7b92a0dc8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1515g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1515g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105eb606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8bb330d7c1732c845efb8cc6adddf56b0e3c9190c367144f0fb72c610d7b3d39",
+                        "s" : "0x0b166b215b7db252504fafb27bf71ea0cac3204765ae2fffc076fe753a009a16",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1516g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1516g0v0Filler.json
new file mode 100644
index 000000000..7c693e539
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1516g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1516g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ec606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3cfe1c5f71f526f07dbdf2100992160fdc160f95e435d5038ead9acb4bad5bfd",
+                        "s" : "0x6ee5af7afaa86f4996bf22851ef3904a473ee530b113ed6cb637a714342fec9c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1517g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1517g0v0Filler.json
new file mode 100644
index 000000000..6df432fcc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1517g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1517g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ed606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x45a06e04a1b8ae66c74456132da3db031ce337cbb8f579b6705f629321bec113",
+                        "s" : "0x17b5035bceaac977e9c0802dfcd0f6002478972c8554cb32c13bd5933527eb68",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1518g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1518g0v0Filler.json
new file mode 100644
index 000000000..fda5e1e44
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1518g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1518g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ee606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x50713982190bb348e7ba421ef3caa20e2641d89c00317f6575b9046f1d519ff7",
+                        "s" : "0x458398e5e2e3d45698a8fb88f73e2d0bcc2d3a3cd790a7d9cc7cc90ae5882d97",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1519g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1519g0v0Filler.json
new file mode 100644
index 000000000..57112c1b5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1519g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1519g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ef606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd108c262854e1b50ae690ce7c41b643b832f1b6004f757d8b64a3dee9634f05d",
+                        "s" : "0x350d4939c38b047feb9bb7c0bef1c67fad55e1017250b21a94c08f1f4df79d21",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d151g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d151g0v0Filler.json
new file mode 100644
index 000000000..273772549
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d151g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d151g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60976064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x88be3da1ae8e594a8719f99349fddbc3abb6cf8cc6e1807dd3ab3fadfd3cdfac",
+                        "s" : "0x1b538503d31c31c955fd6890088d56a669bc849387cabb89d2dead52d7e63ad1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1520g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1520g0v0Filler.json
new file mode 100644
index 000000000..fe538c575
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1520g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1520g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105f0606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x17343e4ebe78f347058fd11be3368301dc8d326b6f6ddba782daf26c53ccb644",
+                        "s" : "0x421add78ec9e40833184322733839c36b54d19ccd7f87672942bfd400055782c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1521g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1521g0v0Filler.json
new file mode 100644
index 000000000..c90cba9d6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1521g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1521g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105f1606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8b3d5d39b28ff42ffb0f6b16b70402a7127166d128096a715800cdda52cba91d",
+                        "s" : "0x23a043fb2b94531e49f10ee0cb5f28952e79e918abcdff022a5ebe586b22071d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1522g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1522g0v0Filler.json
new file mode 100644
index 000000000..2d6dc0068
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1522g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1522g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105f2606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd23e435e198c24717cebdbef31ff528d0ce84093730877a1aedbdf057edfd6a8",
+                        "s" : "0x6f66c246cb926bd229f9ad4cf2ac5b75bfc9b873dfefe0673768d996fec8195c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1523g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1523g0v0Filler.json
new file mode 100644
index 000000000..6453bb0eb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1523g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1523g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105f3606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6f7439fea34e101d55df2ea03fda7f9d01f17c3f7e1d6a40d4dc13e714a05ce9",
+                        "s" : "0x577bb5d440a9d3f81d8a99929c8b3e2d18725622585ed218c09f1cd70772e0ba",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1524g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1524g0v0Filler.json
new file mode 100644
index 000000000..07b1e188f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1524g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1524g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105f4606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x597125bb32cf33bd497a4a7e13dc6588234d5afff04fac635cb44b0b6613774e",
+                        "s" : "0x7feeed869cca7d0e0aa2e2d9271bfbb085fd7b4a6b6d7940bbe10daccc01409b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1525g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1525g0v0Filler.json
new file mode 100644
index 000000000..ef0e21802
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1525g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1525g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105f5606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x14aab2f915249d590b3679c55eae7744a3e40674443ca81f464e9911bddb593e",
+                        "s" : "0x51c6835996a8e056e45da441586ec83e60e978f7c2e6c803438a9c19f599ecae",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1526g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1526g0v0Filler.json
new file mode 100644
index 000000000..043b2c66a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1526g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1526g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105f6606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd1eb7dfce3823fe092301bae61b1e50e86b26b7cbf6ce35aab272d90537322bc",
+                        "s" : "0x609c68c94e55aaba23a35b3d13419fae54408444a7fae2cd5b030218e098d472",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1527g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1527g0v0Filler.json
new file mode 100644
index 000000000..772ad9d8e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1527g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1527g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105f7606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb9737cb6cf6512e8d6738dc2c353dcda5f2204478c40796016bd2bdb67370a6c",
+                        "s" : "0x47160a346b806cd40290de98cfe2a87fd1e3df54be950d1fa3cb815674ec558e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1528g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1528g0v0Filler.json
new file mode 100644
index 000000000..23d083dd6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1528g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1528g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105f8606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x09c9f1936db348a0986daa815ad75d04916c44e5a1d013237893565a32bf32d9",
+                        "s" : "0x4e840f520025aa23d42a9889165795c41cb63a2318cac4bd0fe7c82dae242697",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1529g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1529g0v0Filler.json
new file mode 100644
index 000000000..3d1a42692
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1529g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1529g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105f9606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x17c03e127fc7efc35f58692a4fc2c25cada57f5f241f7180b126f2fb189dc15d",
+                        "s" : "0x4a3c7c8ef1516f5697a5aec24d88636e7a1ca73f7722c1de10be7d1d74ba2db0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d152g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d152g0v0Filler.json
new file mode 100644
index 000000000..2c3d971a6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d152g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d152g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60986064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe7f4bdfc8f149acc7059724c8d2c13053283eec1c7180fa503be2445b632a54b",
+                        "s" : "0x65613d64d7b783eebf56667d10f557d36b74062e04a9a286945c663729394466",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1530g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1530g0v0Filler.json
new file mode 100644
index 000000000..237b08d5d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1530g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1530g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105fa606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf123878dfa6d90ea30db8a9d5d979c033db44c3025cc50df11a519f1821f642f",
+                        "s" : "0x3b3c0314a12a8dc3741e16bf8fdc977f873e504222e979a6960c89b86d40c44e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1531g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1531g0v0Filler.json
new file mode 100644
index 000000000..293685847
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1531g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1531g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105fb606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3abc567a5957931fcfebc2ec3ab4a2f3432647b5e0b1f4182b365e4ce298e955",
+                        "s" : "0x71813a98a1072da0984a3b11178979da4b461e43df330a49c230edb9630d3b1b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1532g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1532g0v0Filler.json
new file mode 100644
index 000000000..0e611f00d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1532g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1532g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105fc606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x332ffff4f77ac8994518e4a659d3288f40befebb3fe5d6fb13afcc8f1749a59c",
+                        "s" : "0x7218eae2b5962f65c95a5e786306158efe0ec6b97f4769587b1cdeb738d24597",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1533g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1533g0v0Filler.json
new file mode 100644
index 000000000..e7e659e51
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1533g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1533g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105fd606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x46cb94cdc751326128c1cd509ce884f1d6ee8295c3a0faed1ac8a756d95787d6",
+                        "s" : "0x4ef1d73d6140864c70a05fb1b90ccedb45f61b00f0784526579479d051594dd5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1534g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1534g0v0Filler.json
new file mode 100644
index 000000000..9a2a5cb5e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1534g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1534g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105fe606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbed2e77eac53f7c68c84db59be944653375aaf9e232e2f91a4c3c31fbddfdcc1",
+                        "s" : "0x122ad8efe8c87e738ce729414d7c34c5092c6f6cd805a50f858ab8c07fa6bdb6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1535g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1535g0v0Filler.json
new file mode 100644
index 000000000..9c170e576
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1535g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1535g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ff606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3acbb8ca6b25863afaf2ea3e6f281153fb36054b2e5f661aff1648c28abe1a6a",
+                        "s" : "0x35fed01fa717cc77e2b0f4a2269437727f0dfe6b7c7cd421a75b2e0030e02a12",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1536g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1536g0v0Filler.json
new file mode 100644
index 000000000..c8c8892d0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1536g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1536g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610600606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0913fb5eba5e61990bb9becb950e25e7de1fb1d57b6ee0ced544d6d6f8631eca",
+                        "s" : "0x45464288e717c94adc590c96c4861169ebfc6197edc3c48ccd194e972ca319f2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1537g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1537g0v0Filler.json
new file mode 100644
index 000000000..232f74fdd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1537g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1537g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610601606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x037514e659b57061a69783a9a8a022ffc1297a409f58d6a844e5c9abacd0e70c",
+                        "s" : "0x3ed9ba902628cba5a4b445e3abf830e393712b48da9923cc4e5590a8c183a13d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1538g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1538g0v0Filler.json
new file mode 100644
index 000000000..5bb11c208
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1538g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1538g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610602606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd1c83dab01daf67e79d562ed6c90525c4026789e82b64de788695add75af6b8d",
+                        "s" : "0x32e62b5bf05acd7ee86e5eb8bdf851fb63ebe7018966ecb33f37eff49c8cea8a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1539g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1539g0v0Filler.json
new file mode 100644
index 000000000..149644950
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1539g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1539g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610603606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1d6fe99132039a1a0c1eb575155b31cb5df492fd67d5c1ad2b98bcba7de7f27b",
+                        "s" : "0x6bb217b5fed433da45fa2a48083032616ec5de8949e833af1e905440e83d269f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d153g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d153g0v0Filler.json
new file mode 100644
index 000000000..359cec1c9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d153g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d153g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60996064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x105930296203a26c06528a3d4efa5957cf7a823253180c10c59ccdd336d44839",
+                        "s" : "0x679d464af4e588346b37ab2bc26374ca836ce7280f84aaae0a15b96111a73419",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1540g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1540g0v0Filler.json
new file mode 100644
index 000000000..5e01bd0e4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1540g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1540g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610604606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb7b914f8aa0eb43a892b0fa3b517f9f0357690efef1e6fb35f088acbaaa50462",
+                        "s" : "0x5c17765f67b40fc63a744dda318f2f1942088c41dce1b206d867b77c4f3b122e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1541g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1541g0v0Filler.json
new file mode 100644
index 000000000..837d625e0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1541g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1541g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610605606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf30e92a1e4125b1044a090548ef382155ed97637041016b330de80901f1a71f3",
+                        "s" : "0x6bfc6a247af3a168eee8d09cdc5c1c3014716e4dd02261557ce2a3df0038880e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1542g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1542g0v0Filler.json
new file mode 100644
index 000000000..2507d2eea
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1542g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1542g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610606606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xea49755fdfa3f0ff669762598b71921643e9572473db9aa695c3cf6542fe3079",
+                        "s" : "0x31a7da6361eb2c7319f0ace29c07932cb1b276bb58afffd3f446230c6e5b3107",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1543g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1543g0v0Filler.json
new file mode 100644
index 000000000..91fdf770b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1543g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1543g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610607606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x59fe36d6ac94c5ac46a082e828ba175a57053571bd4425b324cc7e973ea1a8a0",
+                        "s" : "0x509a371d59617e1171f3b54487f8fbf11ec22bc077d391d2a429699b9c430b33",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1544g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1544g0v0Filler.json
new file mode 100644
index 000000000..0857e9845
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1544g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1544g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610608606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5a7d67b015fce2e55fd41a63e321417a6bfa3aa486fe398995b8cc67a6a08997",
+                        "s" : "0x6119e3667d6f95675397b1ba311ea61a6bb37fa11d20b525d1030750bbd0893c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1545g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1545g0v0Filler.json
new file mode 100644
index 000000000..b146016b9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1545g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1545g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610609606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaae23c4ec88f396071ff7b4fd77cdbc5a27df82ab2b4e71711292c7bd33481a4",
+                        "s" : "0x0a6a1d8f06a405bc6f670191e68bdb04938816fe78d3684c4fcc9c3c66ed8d87",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1546g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1546g0v0Filler.json
new file mode 100644
index 000000000..b436cc4fe
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1546g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1546g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61060a606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xba90427f847e4bf7715b559d4375594ef6eb55f78b15b3c52b88323fb085de2a",
+                        "s" : "0x22c14c5ff5ab467a17d0cba2a84cbaacf6884d1ca5a9a28f6eb0d648b6083c07",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1547g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1547g0v0Filler.json
new file mode 100644
index 000000000..3a8a0fe5f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1547g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1547g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61060b606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xba4a668cecccce017500e6e73415aec03f8d202cd9057b5178f3859da7889877",
+                        "s" : "0x6b6332f295633a87955af50947f8985c9ffb3eea084424ec896f3910d89fe599",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1548g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1548g0v0Filler.json
new file mode 100644
index 000000000..1a170dfb7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1548g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1548g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61060c606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe0e294bbcf6e12029ed46c1df7ce68d3f7c82be76b5121e8ea7fa6a44c056d90",
+                        "s" : "0x3458b34bd0e6f539f37baf70bdb363096e55ed65c3d332e427208a6bb8a890c1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1549g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1549g0v0Filler.json
new file mode 100644
index 000000000..381d79f04
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1549g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1549g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61060d606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfe3940fd3b1044a678ef1b01dbd936c8a90ad28b4bf8396803f1f0880c0cf400",
+                        "s" : "0x710d1c049e3d88d3663a2a03a3547ca3ff9e887bdfcf89d269a5f97dacc66439",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d154g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d154g0v0Filler.json
new file mode 100644
index 000000000..8316a4dcf
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d154g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d154g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x609a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x165989515a9593ea245773ec6c0d5623855b994b5527e94fde5346b3d7000593",
+                        "s" : "0x4935e9c9ae2c47788c3fce239c41d64798e9b736831557861730917ddff1d1a3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1550g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1550g0v0Filler.json
new file mode 100644
index 000000000..79daff210
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1550g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1550g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61060e606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2f294eac5d9e4351331156b51cf3444ae8241b2e2378414fbb161b9f9452b524",
+                        "s" : "0x69a72b7160cb39c87d9e56291ac64d4d83cce1751b42c8414e1cb94fd2a929e6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1551g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1551g0v0Filler.json
new file mode 100644
index 000000000..8da8d815e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1551g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1551g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61060f606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0e31a73319a156e711f1082d2cd1ae73e562cec7ee389b19969cf808c6518543",
+                        "s" : "0x0f34f397a27d5318dab70ee935938f296a5fdc4baf91c8523ebcdddd028bec3b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1552g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1552g0v0Filler.json
new file mode 100644
index 000000000..d00ee8598
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1552g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1552g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610610606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8fe2d687fb275b4f8a3f504af2be7644c416c5989619207f7f735d02ee856050",
+                        "s" : "0x1697eabee54961871e24959a6254d9c1b16344272c279ac1d37e39a0ec0793a3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1553g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1553g0v0Filler.json
new file mode 100644
index 000000000..06e6a6898
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1553g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1553g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610611606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x799150b344b01ed0fb12b9c90bb0dc72067720df666913207e8b9949d13c6577",
+                        "s" : "0x4111c492dac3d6b45f9cd98cd0cb136acf2a53cf6a354a785dde752c26d6fc1b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1554g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1554g0v0Filler.json
new file mode 100644
index 000000000..825a5cf91
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1554g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1554g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610612606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x23b59e8033831fa2b6c18623fca727c7b1b4420b313f20f2dc14c568b9afbb78",
+                        "s" : "0x5d4abdcd0ec56982faff6bfa694d32118af1ed711d635f2a320028db1ff55e93",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1555g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1555g0v0Filler.json
new file mode 100644
index 000000000..f01523870
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1555g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1555g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610613606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x92280781f56499ac2d285e99998b822a267a34040a2a94fbe88c9d70253f489b",
+                        "s" : "0x0e9cdb97c94984b8d72c3c13c9112b7945a647662ad71982870a5d349c567291",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1556g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1556g0v0Filler.json
new file mode 100644
index 000000000..4507153ce
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1556g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1556g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610614606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2cb8ab55be7f28b8b014da567e362229ee68fb3b4fb1b3be4311869019155448",
+                        "s" : "0x0ae0c71fd37b7ea5b1f7b41007ba83f0a17963fd7981e4f710279abc6c1692",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1557g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1557g0v0Filler.json
new file mode 100644
index 000000000..6f2b9f6e7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1557g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1557g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610615606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x28cfaa021d8d3105935e840b6324efa9bc311f3ad137f2c9638a385dd971d6f5",
+                        "s" : "0x2cee503365839eeabaf8c20e6b6e3fb954f875e8a7e05a2f6a216ba97ab25863",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1558g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1558g0v0Filler.json
new file mode 100644
index 000000000..8e9fb990c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1558g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1558g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610616606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8ffab0b593936de4ec5d5711249bd166f909a0fe2bd082fb8269c125255aa0e5",
+                        "s" : "0xba8b9d2db347a482839126f3825d8ab62b7cd3c0728d0e18a2912903128438",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1559g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1559g0v0Filler.json
new file mode 100644
index 000000000..a8922f4ae
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1559g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1559g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610617606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x31cd93294314c0aeb2b6081c87a92bb7b5ec35955336cb78e02444e3e2921ecc",
+                        "s" : "0x1ac50c499235cec1c2e373270e5d8b8152802e58f391fce4a5046922079e98de",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d155g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d155g0v0Filler.json
new file mode 100644
index 000000000..e1033896c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d155g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d155g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x609b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd5a2d6b0b496a12c841975af0371677f568fbbe1587a2e0df7e7fea5b772e348",
+                        "s" : "0x79b71f59055fe979adcac9e368a892d49469441e2a4623554873db005871c288",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1560g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1560g0v0Filler.json
new file mode 100644
index 000000000..1339b4cf0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1560g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1560g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610618606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xadc6db445fc77598cef1a831ca907ee14087e68dbc9232dd77aa1e39da5e6b38",
+                        "s" : "0x2fd57d06c7a339c371fb3dc0d36a7d1968d9173312661219d3d91e146ff5c19c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1561g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1561g0v0Filler.json
new file mode 100644
index 000000000..d71ff68d0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1561g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1561g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610619606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3f1b1361871982770374fd39432f9be11f4b93f0e2864b265d876ecbe6c59a9b",
+                        "s" : "0x64156d199ff8e189e70af76486b4ea43e8d5db7609ec8c2c3119f1d1b9249d73",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1562g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1562g0v0Filler.json
new file mode 100644
index 000000000..4956796dd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1562g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1562g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61061a606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4286f0c8cbb4d89e7eef3a64682a8df54abfb6a28f736eda3a881f38004450ab",
+                        "s" : "0x363c54fb0cda77bdcc8083b078fef0d254ad7561e844147fdc1ee7a5f1b9d44a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1563g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1563g0v0Filler.json
new file mode 100644
index 000000000..9a9d9ea41
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1563g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1563g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61061b606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xea55d0c00b466b619b1ae279f657a812ed02c83994c18e07a88e98afb4737666",
+                        "s" : "0x6583ad8f6636e22fb2ed3ee0e5af642fee6b58d44d481718d6053d139d4c372f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1564g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1564g0v0Filler.json
new file mode 100644
index 000000000..855ed78f0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1564g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1564g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61061c606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf4305a5703f204caa8d1fb5bb027b703d619b35504a757a010a40b571d598083",
+                        "s" : "0x02e4cd6d35d2c03a1a748fd460f62303e7c673999b48ec1a5fb39718a0e59ed3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1565g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1565g0v0Filler.json
new file mode 100644
index 000000000..92bb0c671
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1565g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1565g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61061d606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf6fa39161dec79106405b0c8a84f876aa7b4f1d1b758d6ecb0fb896952af153d",
+                        "s" : "0x785b0bbcbb6f2e980b2f5438a3fe6021d0b27c179550fb7091de5935de206a94",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1566g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1566g0v0Filler.json
new file mode 100644
index 000000000..81435b3b6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1566g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1566g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61061e606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xac3c1e8161eaa84d9dde27ac885ddc9a802213b94d1475b9a311db8b85dc153c",
+                        "s" : "0x4ce812f959f28df35916b120f28b204961f9c499ccce1674fc017080a8ae2636",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1567g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1567g0v0Filler.json
new file mode 100644
index 000000000..c085e6caa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1567g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1567g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61061f606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd52cf6d468cb1cccb8268ae1875ef93b0c33e9ee76033ffdf8033e0501855dfc",
+                        "s" : "0x40cf70a6c76bffcd927583895e474af29d325beb941eaf54ee20392510a96577",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1568g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1568g0v0Filler.json
new file mode 100644
index 000000000..af511ed56
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1568g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1568g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610620606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb0e289c98be96cf1137480563c56b22b15691ff9569b07d1ec868949de88ef75",
+                        "s" : "0x1757c753cde89704e223897483b5df30f9e092e1e3d9b3034570b1803c9e251d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1569g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1569g0v0Filler.json
new file mode 100644
index 000000000..9e9dcd081
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1569g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1569g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610621606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x820a28fc5fa12ed04e6a6a00bc3ee0788e5fc1357df0f98f2cba8b64d5eb27e3",
+                        "s" : "0x5aa15af7ba2a0517728647c94e145e3308bda9ccf6549ff6c804f0ea78b3eacd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d156g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d156g0v0Filler.json
new file mode 100644
index 000000000..a0998673f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d156g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d156g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x609c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3a2c7971509b8a348c03949f2a943585e66fdcea4df5b0db6f521986c29a371b",
+                        "s" : "0x4e1ba98676941eee2f110b9da32118565a27d8761910c0b5c8dbacc2339a60ad",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1570g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1570g0v0Filler.json
new file mode 100644
index 000000000..3a8ef7b5c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1570g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1570g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610622606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x37d62b9f944466cc4692f2154e0f9abe34fc5dc60ab7237e96faed11a7884646",
+                        "s" : "0x13438d40b3540a30db2aae4f02b02645358c1002fd63e2773c1123cc1df3f1c9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1571g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1571g0v0Filler.json
new file mode 100644
index 000000000..a8f9a124e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1571g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1571g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610623606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x252b33e73c791174defc1819a1f5708559bf5dae19b5da95167b6925a83380ea",
+                        "s" : "0x1e434843ca4e12fd88d121b1fe459bbd6f141ec3489e3cc87f8657f6824215d5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1572g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1572g0v0Filler.json
new file mode 100644
index 000000000..6e36e5d38
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1572g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1572g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610624606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x63fbb1d74c0a4a8cac376599c39477fedc92c08173424b55f3e43915ed5ea7d5",
+                        "s" : "0x44ef55e0e3f8375b6c51b082e223ea20c18241ea42b3aeef3067dc4deace9b7b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1573g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1573g0v0Filler.json
new file mode 100644
index 000000000..880db89ee
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1573g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1573g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610625606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4797dee8a443505874cc5f1dba2bb6beaf73b090e828917e8db8f5551c83cc92",
+                        "s" : "0x096c38fd53dea68517333d84c93546557316ba11d9421138cc7d38c75ecd5105",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1574g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1574g0v0Filler.json
new file mode 100644
index 000000000..50f48f766
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1574g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1574g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610626606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x18143c8489c4939de17d8e2723012bb26e55e0dfa71309cf7298ceca5d31142b",
+                        "s" : "0x4075211fc6184e6f5d76f7758ba714a322b853b053280fd04b326ccdaca3911f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1575g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1575g0v0Filler.json
new file mode 100644
index 000000000..e0f248d5d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1575g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1575g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610627606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb26f931192cb518c875f9c0d80c8e4c1abfb632f54ef22de8af4eff3883e6787",
+                        "s" : "0x1daae02abb714aa17f5e02ba38e4f31076fe6f527745c14ef19b034809a48667",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1576g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1576g0v0Filler.json
new file mode 100644
index 000000000..e0d982805
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1576g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1576g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610628606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb97b0e21451198ffd20839e74e04159e2fb02ac20705a9ed8d50530a16869b9a",
+                        "s" : "0x7bccf1cc1e35a127bd942d3d18f6487cf4dddd0109113ab5adb683fe6061051e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1577g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1577g0v0Filler.json
new file mode 100644
index 000000000..5eeb21114
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1577g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1577g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610629606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x65d4f64c0183ea5776ce2450ce228b22213ef5acbaf164fe01f044ef31961569",
+                        "s" : "0x16d07678ea2214a405db2ee62ddcfcee15056279fa106623c0f3cdc3dfafe7f7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1578g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1578g0v0Filler.json
new file mode 100644
index 000000000..c580dd96e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1578g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1578g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61062a606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8f70154649cb02c2a41fb84d811a8d8b1bc6b8d9fb2e6248ae6fd0005d0ff0ce",
+                        "s" : "0x5556a2d447d85e6891616deb29d61543b1ea3b5d33e53c5866efa65703a8b19d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1579g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1579g0v0Filler.json
new file mode 100644
index 000000000..ff8da18f9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1579g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1579g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61062b606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1032c2881bfb4407d0b59ceb97a4f4a30b69ea9d45260a47ff4d7e66f859aabf",
+                        "s" : "0x2026bf227d12dbe3b024072e5f5684939399a0e02a4ca4c941360a3549f3516a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d157g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d157g0v0Filler.json
new file mode 100644
index 000000000..322b3073b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d157g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d157g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x609d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x55bfc7600d5c20fac3ab744306cd00f15e4d635ddbdecaa664676ca9a7b241c6",
+                        "s" : "0x5a4aa6b85a20fd7cbbd3214f97758fdc0903fdbef7e378c98c6a798fc2deabb0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1580g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1580g0v0Filler.json
new file mode 100644
index 000000000..d11353f60
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1580g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1580g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61062c606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x14defd1c20eeb96ca0157ea5a0559f735fbd163cd022739180625a428f8c76b5",
+                        "s" : "0x1de220a8b261f8184a86cb08d08da32ded15a9ff60cb93b20906fc1b0f9af8a7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1581g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1581g0v0Filler.json
new file mode 100644
index 000000000..a57f5e9d3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1581g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1581g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61062d606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdadbadfee02b5e3b0e70e31488c072d5468aa5ee8ad3f3b2669bb2f1a257c7eb",
+                        "s" : "0x6dd18de9731fe64f00ba67a37370b02ad0b10402c35de160f578510454a71a35",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1582g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1582g0v0Filler.json
new file mode 100644
index 000000000..63d69ae0a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1582g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1582g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61062e606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0240062c967086450a4537bd386f31b038fe00e798be97dc9e55851dc3abbb37",
+                        "s" : "0x7a385980fa60cf4530d8e4ee39ef508b490b25a3cfe5194c553b1b1086545164",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1583g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1583g0v0Filler.json
new file mode 100644
index 000000000..a1587a898
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1583g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1583g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61062f606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe0261c27334b29dca0923ad0745312ba4d0830337321bed44f15896917fd84e1",
+                        "s" : "0x69bbf4c17e3157e7ff6bdf5d4c599d61c7962cec827c79ee1641cf1ccade45df",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1584g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1584g0v0Filler.json
new file mode 100644
index 000000000..878dc786d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1584g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1584g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610630606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3b1eb38ed157231da6980f3db3b8c7f34441cad54cc41e9a78ecb588142cc7d6",
+                        "s" : "0x07b8a9e33e2b720647fbd85556786f7c7edef0525de150a61b65e51978ccc66b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1585g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1585g0v0Filler.json
new file mode 100644
index 000000000..7962302b0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1585g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1585g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610631606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x58f0c9dd23828df4b90aa33f98323c8a0fd3f222949b4cc4cf32fa8e99bcc586",
+                        "s" : "0x2d19a7c9163eb002774ae17cdc0dfd2e519dc16b6d72520758e0e4fce8b0f2b5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1586g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1586g0v0Filler.json
new file mode 100644
index 000000000..9a876409c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1586g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1586g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610632606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd133dece06f0cd5a76cf4c7fa8c9f1ff6315323aa7126cd5d6120e4a9c2d1fa8",
+                        "s" : "0x0e330e08864082acc126a70e854536c0eb772c342f2eadfdf784493f09bf9e88",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1587g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1587g0v0Filler.json
new file mode 100644
index 000000000..7813fd97c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1587g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1587g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610633606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb2c61348fa70f3ace3fe3cfa9fa23f7636151e4578aa4f37c0c9330bc80681d8",
+                        "s" : "0x1681c76c48b79ad9d54949122b35b525ddc0be47cb4077509a5f820f53a02f7a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1588g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1588g0v0Filler.json
new file mode 100644
index 000000000..ed06b19a7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1588g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1588g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610634606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcb84cd3177e5e207796c52e3b56cae883745c0a0e25aa5f3377055e98b963509",
+                        "s" : "0x5a358d04848be29087cba7d9d51f7a881fa16b677ea6b545fe7a225d3c70e706",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1589g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1589g0v0Filler.json
new file mode 100644
index 000000000..67f33cc36
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1589g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1589g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610635606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb924bfb7a5799917556ebd6d0a19ec20daf2141e8e9dfa110ea152a5349c5269",
+                        "s" : "0x1de8d1ad0ef6b7e693eb6bf8928b4ffc4d6d60f3c936329d33d46082d36edb4e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d158g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d158g0v0Filler.json
new file mode 100644
index 000000000..b59471ba9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d158g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d158g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x609e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc6635ef316ec12136cc12241038bf611fdda14054a78450ac8116ec7060778df",
+                        "s" : "0x717dd6743654bb0d857e43c849fe9f97b7107e3e9450b7afe69d34430a52a1cb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1590g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1590g0v0Filler.json
new file mode 100644
index 000000000..1879888dc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1590g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1590g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610636606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0e8934d75f96c2777572bd6896a4712098da794a41b2c077f9f51d3de552384d",
+                        "s" : "0x79613a957161ee2a89e4700aade79c11a8ecdc095642821c5b010bcef5744306",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1591g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1591g0v0Filler.json
new file mode 100644
index 000000000..c30fe76ed
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1591g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1591g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610637606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf6716530c89ac90ee1e747a71377b96b9c8edd811090c1be081119883b0613ca",
+                        "s" : "0x34ff626703c0a71f6bc0a38e83aaaebdba601b0e39f32c04981825cf9f133f98",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1592g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1592g0v0Filler.json
new file mode 100644
index 000000000..27ca463d5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1592g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1592g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610638606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0486eb2a5826275163593d6b646a24e528432797021cf10316e620c7d95dae66",
+                        "s" : "0x5d7dbf74b97ef541142a22d106d64730ac97da104625d8796a9cd953f3e2e132",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1593g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1593g0v0Filler.json
new file mode 100644
index 000000000..48c2233ca
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1593g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1593g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610639606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x69b3d1b7e98f7bb8317d6d12fe7b7b3d45ecdff30931e1943d5a92bea9e6323f",
+                        "s" : "0x2ce0553a4a899b80470c6c5e9ea349dee871bffd8c61fe39ea878dc9902205da",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1594g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1594g0v0Filler.json
new file mode 100644
index 000000000..4fca519a0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1594g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1594g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61063a606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x575fce9127db9333afdf0dc41116ccf31fdf82711725662ca34dc36fe1991080",
+                        "s" : "0x702e76cf91f46e00028c946f80fbe1a87c7b072b84c1ce9bf1b98719049f4c46",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1595g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1595g0v0Filler.json
new file mode 100644
index 000000000..a30942fcb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1595g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1595g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61063b606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x98d195ad63502001a120afe5dd443ac8fde8389ea7a7f5d0cb9538f81b48b035",
+                        "s" : "0x1b5b98d5f24ee709c3252d0da3ddb26837a56aeeaa10c28b9332f09a5d217c0e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1596g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1596g0v0Filler.json
new file mode 100644
index 000000000..3774ef2f7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1596g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1596g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61063c606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x66172ef1d560ac7fd769f2455987d202e79c47a542e35504888bc85d9e232196",
+                        "s" : "0x6fdb06bfbefb24458d0756743de6b93a406cec926f5a4d4b3977287634af67c5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1597g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1597g0v0Filler.json
new file mode 100644
index 000000000..d6e5201dc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1597g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1597g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61063d606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x65afbf6e2fd15624e6b0ae84d9f18ac3baea614fcc1f449c373f7e60de8db69c",
+                        "s" : "0x4f5c46e5b9d8447d42c159eb51366395cf4bd835fdc65d7f1b8ab7d36ae6acf3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1598g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1598g0v0Filler.json
new file mode 100644
index 000000000..f3383cb74
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1598g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1598g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61063e606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3bfa6174cf2d924fb64d229de810fb8fa07f27590f5678382944e5ab19f5f83e",
+                        "s" : "0x24ab663d65351d524559d0d29bc3462eb8a9cdb87b0032fe6d4c5d16fc8b628c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1599g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1599g0v0Filler.json
new file mode 100644
index 000000000..ab4d654ca
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1599g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1599g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61063f606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe47a011e1fa19bd7d97942cceb7bfd2835756ce0d139c7c822fde677cbb97cef",
+                        "s" : "0x06db6386a802089bbcf5b9e7bbd1fee11270ab7e637f0b6221c7b209a7bceea9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d159g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d159g0v0Filler.json
new file mode 100644
index 000000000..085301c91
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d159g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d159g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x609f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x511433b1e8a32d34faa412aa3b5c890ca3d5969fd1f3ec89dd618d39de96c1c6",
+                        "s" : "0x378491c6f62c4cae07e76d5d05d964b271c802d9c478cde29221ebfd24a42894",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d15g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d15g0v0Filler.json
new file mode 100644
index 000000000..1819e016e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d15g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d15g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x600f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaeb0f5305d823a742fa7d3aca45d156e092c084bf87c3f8ef461690ff9682ec",
+                        "s" : "0x407646eaf804a9daf9b93d45bbe1491c1fae88f7f02956bff8bdec46682024b6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1600g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1600g0v0Filler.json
new file mode 100644
index 000000000..e3632eafe
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1600g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1600g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610640606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2b93baacc666015b199767c00b7c46d6fefc420ad17a17c61c25e3247b112cce",
+                        "s" : "0x3b42526da05950f0327aa6e5bf314d47f0b304ebe6c71ed969dfaf8f459e870f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1601g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1601g0v0Filler.json
new file mode 100644
index 000000000..a41430240
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1601g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1601g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610641606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x955764f5d4a0ea1861b8e17b49467eeb213b491021f6def17d5aee999c10c29c",
+                        "s" : "0x690db3f5665522376541a0694fde120c066c179207a2f89b66194a1554abb059",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1602g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1602g0v0Filler.json
new file mode 100644
index 000000000..b56fd75b3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1602g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1602g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610642606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x67ed28e2e15090f206ba5f55ad1563053c462ce5eadbfe4cd22be7ae165b64fc",
+                        "s" : "0x2ed796893c3ef2dcfc524b46b933517893b4bc945e755d42f65d5f178ba75a47",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1603g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1603g0v0Filler.json
new file mode 100644
index 000000000..5a1eb0480
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1603g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1603g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610643606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x946667b431567cd764b617912558d3acfb20b8696dbfdc6e61c8298688b1e7ec",
+                        "s" : "0x17269e6b590f37eaf85ed6bed7fcd83f2b8189e5f4846c5177aa0941b4993bfd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1604g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1604g0v0Filler.json
new file mode 100644
index 000000000..df447e828
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1604g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1604g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610644606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb57c23bb57e16a9da9f92bdfa5193ef8d04331edf4a4825ea53f19fab57ed2b9",
+                        "s" : "0x17b66cd5033f9dfbe098a06605a61ed8d24530355c185f3c7d8cb9a1d22f4b7d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1605g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1605g0v0Filler.json
new file mode 100644
index 000000000..9a740886e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1605g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1605g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610645606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8dcb2aa0ef4d9cf76a8e2c95b74a12bf168bfae6d46fbcf7d866b936e4d1e5e4",
+                        "s" : "0x46db6620d5a091040f088e3419080ff92e4227727d4e118ad9504b8188b35abb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1606g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1606g0v0Filler.json
new file mode 100644
index 000000000..ae3e91c2c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1606g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1606g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610646606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9ba98084780f7a44dc69bdaa44fd11486450c9844c5fdd653bdb47a77168cac2",
+                        "s" : "0x3a04bcb782727f1add39dfc7c92fd2c5d86cf14694917b2ac0b11ec7db5bb060",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1607g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1607g0v0Filler.json
new file mode 100644
index 000000000..2a4a5ee51
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1607g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1607g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610647606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf52937cc5b31b1758d4d5c764ecbc399f4a84312deefc17de75b573a5f754ec3",
+                        "s" : "0x669e1454d8f83ef281643e34cb1eeee1c3a70e480a5f0e0e72fc60e023b7c050",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1608g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1608g0v0Filler.json
new file mode 100644
index 000000000..fcf0eecac
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1608g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1608g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610648606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaff2cf24ea04b09bb753d3a09c46d6dc6ccec9ff480f36b2ac2c3dcd91959539",
+                        "s" : "0x10067aeab984e21663ec7ee93ad2345a27d59f3c3de44c94ee5c392e32ebd196",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1609g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1609g0v0Filler.json
new file mode 100644
index 000000000..38fd86ae5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1609g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1609g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610649606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x15711a78ee7210baeb7d6f354516b631005994d60c6ba8b3a4eb1417fd948da3",
+                        "s" : "0x45d6542e3493e0711c8f83f453e2747540f58dda42d82e44b7599935ec819682",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d160g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d160g0v0Filler.json
new file mode 100644
index 000000000..39d88ac7a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d160g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d160g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60a06064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4e8b235b50224a1f9698707a1f8a2ac1afa8103d7faa81626eb87fa88814532d",
+                        "s" : "0x19b230c887d6d45e5649b92a0dc2167ffce4dd40adf48cee02e6161b0a68e795",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1610g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1610g0v0Filler.json
new file mode 100644
index 000000000..3dedf8991
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1610g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1610g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61064a606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe230583458f0e7c984fdcf99eb986d23b2e46db5c9f30e6e7dcd2a181570d9ec",
+                        "s" : "0x768d1cf6263cebd15849a97ad780adc1ed02fb425de03c32c113f80c7b16b7e2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1611g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1611g0v0Filler.json
new file mode 100644
index 000000000..f77e6a7aa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1611g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1611g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61064b606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd1d1139801e5eed8ba1f3d4cdfa501b7ab9b378b5b9addf60330f347557b025e",
+                        "s" : "0x7a3979be234f9a6d9d7ade7b4c37016d785d6180a639a656ceaff9d3d1f80855",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1612g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1612g0v0Filler.json
new file mode 100644
index 000000000..bc0910d1b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1612g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1612g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61064c606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8a6ca57d89f15cba1d3a2afe8e59c399833d6a773f0d098d0f304184f258c688",
+                        "s" : "0x36cde6e045f5bc600cd491c464cd1c63a91566be260ac0d5209c69589224a4a5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1613g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1613g0v0Filler.json
new file mode 100644
index 000000000..5b5b0c595
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1613g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1613g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61064d606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4c1a59d7d4aad66315437600beda8fff5d8132fce80188fe4d57e1093d6e7235",
+                        "s" : "0x3065bfc9c8009bb0c396bab54cbf517a4fc7fe0bc4248c1dd7455c313b5b6089",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1614g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1614g0v0Filler.json
new file mode 100644
index 000000000..4c105e4a0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1614g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1614g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61064e606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf2cfeb5509c95dc4c390155af249fbb83809d943ab39a42c4d869afe1e95ef45",
+                        "s" : "0x43d5345b326bea0a2730b90271abe6499787dedc79b65644ee9faefe6914457f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1615g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1615g0v0Filler.json
new file mode 100644
index 000000000..5a1181745
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1615g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1615g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61064f606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3967e55623ad1ed8f5e1a442254ce32b20ecaede3f1879559bbae740b09acabb",
+                        "s" : "0x5f1b91451ccdcf1fe4052b02f0336b93bfca48df7e4bd787697e673182dab4a8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1616g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1616g0v0Filler.json
new file mode 100644
index 000000000..242721920
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1616g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1616g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610650606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd132b852370adc9b89bc1a2b58effb7c42f37b4be8d0908eaf59cc23de873907",
+                        "s" : "0x190d0d0232725862be2d245606a0c9694e8c2a25e16e1a02d925a1b3d4180e1a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1617g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1617g0v0Filler.json
new file mode 100644
index 000000000..91aa33ed4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1617g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1617g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610651606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe2f67513efc31cf5a65175813ef40a99f5c0fd4a75410202825e7f779d6f9cd5",
+                        "s" : "0x1f9cc79a4b61e65ec742adf89bc4666b8194214358b8888203edbe2ded3c1875",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1618g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1618g0v0Filler.json
new file mode 100644
index 000000000..5067b45e0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1618g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1618g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610652606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5000aa1e2371b4075bc2a033cf4946ffab21d61bb867aaffe62b7880edd3b99d",
+                        "s" : "0x659de152893c2ad743d2dd812a9341310889dca768d89fff7c7181632d3e3fe7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1619g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1619g0v0Filler.json
new file mode 100644
index 000000000..5cbc65a21
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1619g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1619g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610653606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x53867eece099e15959575e5024a8283eecc3402bc20fa2b29aa4ee7ca992d5c9",
+                        "s" : "0x08aa67f4da4c28c64cb1de5c89b44fbeb250c6b5b360afdf58eef50b05c57e84",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d161g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d161g0v0Filler.json
new file mode 100644
index 000000000..f109d63f9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d161g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d161g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60a16064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0812e34bd0dd201b2fbb1607fbe1eecc45576f9a0b9742a24ed03db0fb640fbb",
+                        "s" : "0x0a351efba9b9b2067c4abe9174ad50887d8e5822cad8d264bece9bd94c50b1de",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1620g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1620g0v0Filler.json
new file mode 100644
index 000000000..43f4d1704
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1620g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1620g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610654606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0eac678bc02d16bb55c137b86d29b04d6680a0f00efc09dee3af83e215e901f4",
+                        "s" : "0x429f6ad01577157e3631e950d72082016ba9e2d597ee360d8a8f67c141f85d5d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1621g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1621g0v0Filler.json
new file mode 100644
index 000000000..9bc2f28a3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1621g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1621g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610655606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x13564fc00d78ae5aafc056d566a70de8065c3cc490414c193eb82cf43a15c5d2",
+                        "s" : "0x0d76576aca41ed7d3378646379c407fde8549aa3ed156997c78c76d9dfc9e4ff",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1622g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1622g0v0Filler.json
new file mode 100644
index 000000000..0ce523a01
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1622g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1622g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610656606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x74334b3d23bf544d86117e304cdbb65f933b19b1b18f2b39e47e61c1f567e78f",
+                        "s" : "0x1ecd3803e5b5b331577e2d3013fec0833f012926971d94d23d6caefe85b5222c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1623g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1623g0v0Filler.json
new file mode 100644
index 000000000..51a9db345
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1623g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1623g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610657606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8f418e92e85a59aa210f6c68485badb9447429511c25f1df6888edb4dd075b4b",
+                        "s" : "0x2ee4798627557a72e41b73e3a7fc39dd57db6adee8a08a76649e19995200f35d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1624g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1624g0v0Filler.json
new file mode 100644
index 000000000..cc05f7efb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1624g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1624g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610658606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x125bfc11dd03cfdaca1cb122a9ff2212ebf3a78f6341617829a2346cacee00ac",
+                        "s" : "0x3153a02987a6923dd9e825caa63aa902575283fa5f88d7747e03bbb8e938477a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1625g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1625g0v0Filler.json
new file mode 100644
index 000000000..ccfc86490
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1625g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1625g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610659606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6ee3bc1815bffdaef12302160d96d823b56dfdb1c0a27b473184ae068df767ab",
+                        "s" : "0x049f0dd29a183f28bb167e7e45850d5296a65db2eff247ecbf939aa4be8eea6c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1626g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1626g0v0Filler.json
new file mode 100644
index 000000000..8ac16ca51
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1626g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1626g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61065a606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3a9744a04c61925e4adf9188e3da60bb1c4c01356fa727ac2532b9c07c8d1b11",
+                        "s" : "0x53813bffbf1973eb427802aa875ad504aa034524e756cebee0990813d1aaa720",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1627g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1627g0v0Filler.json
new file mode 100644
index 000000000..2676097e9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1627g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1627g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61065b606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0c6778c75fd79bce6bda4b6a675027cb0fe6d486dfad62c8016d903b44e0872d",
+                        "s" : "0x5ceb97e922adc3847224117437290031c1c71cf39c726124d79d586c4fcafe90",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1628g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1628g0v0Filler.json
new file mode 100644
index 000000000..72a616d65
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1628g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1628g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61065c606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x035b2ce8b8bf10d0ea681eeea1d6131be0048bd0f19120663e72b73d3d258c15",
+                        "s" : "0x0c0d41e4149d38ca3c464e4b640b15d274285c3da40003ed25bf3bbf453ed1fa",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1629g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1629g0v0Filler.json
new file mode 100644
index 000000000..760e855d8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1629g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1629g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61065d606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7ffab346e96c60670200e35ace909fc1427cfd6a85561d25e93110eac6e4a731",
+                        "s" : "0x6e639d8b7d06d1a2a587ea98ad0bb5bae41ed42d6111cdc4302b7b3b95ca6eae",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d162g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d162g0v0Filler.json
new file mode 100644
index 000000000..52887b1f0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d162g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d162g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60a26064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x01f5408c9c9b9f47805f97b00c40acfbb877c2e6c43a099e34d9d3720328341e",
+                        "s" : "0x012b27a875517886614813c6d75dfb606c498c4acf504cb953a0562e5fa7e451",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1630g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1630g0v0Filler.json
new file mode 100644
index 000000000..3ecd3eabd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1630g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1630g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61065e606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7efcf7c6cacf97388d9d1ad05584502300144ad7082dfe26516d285ec4113f6f",
+                        "s" : "0x2a7be85ed8c1cd3868a8f8312a1ec78a688faa61ca23f54fd471aa124e2c3d6e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1631g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1631g0v0Filler.json
new file mode 100644
index 000000000..b444c17ff
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1631g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1631g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61065f606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x124981c876502b224496b2d5c172e1e9224fdd347d307c6225cdf32b5b8593fe",
+                        "s" : "0x1dfb8ec5ed7f155a3295031acb0517d7b7faa95670ecea816c6e4c8de4984f85",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1632g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1632g0v0Filler.json
new file mode 100644
index 000000000..bfea5a9c7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1632g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1632g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610660606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x996e0025ec1000908ee6ddbc06b9710f0a16d0d7d404dc63a48942e707980ec5",
+                        "s" : "0x402dee2edbad68bbc9a0ed9a00302bd4a8ab455da0d4a43ca4789fc1e16c1971",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1633g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1633g0v0Filler.json
new file mode 100644
index 000000000..93c96ce3e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1633g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1633g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610661606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x101fe5fd139945bc97d024b10fd8732082ae91b7940391689ae13eaabaa13921",
+                        "s" : "0x0bfffd89b1e662f6a362d591d416cea6b58377892cffdf19a1ac2d4e23e2dba9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1634g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1634g0v0Filler.json
new file mode 100644
index 000000000..f6cdaab07
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1634g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1634g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610662606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3c921730a6c8528c9fbd765142a577af8941fe467501d1a1597e02170e234df4",
+                        "s" : "0x266c5cc30c8abd866af8e0a68a88e345b58c7d15b25d9606109de4973bcd9c07",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1635g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1635g0v0Filler.json
new file mode 100644
index 000000000..020a63f9e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1635g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1635g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610663606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5cff02e1b955473c1d86b98fef4698f5aa825e28162222d4b851a33a7f577ded",
+                        "s" : "0x7e29cac0ee68dc747554ed7bfefe4869e43177d6bf23b1584fd1924a3ce97083",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1636g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1636g0v0Filler.json
new file mode 100644
index 000000000..8f4b6fcff
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1636g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1636g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610664606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x288f637f4326bbeab5e058f097575afd0f0f12d4e6b8e1bc4cef02244657be61",
+                        "s" : "0x4810fc6745a0ec911b73486fffb0e1c1214469830a6ad5937b47e4b0018e93e7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1637g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1637g0v0Filler.json
new file mode 100644
index 000000000..1e7b2b224
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1637g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1637g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610665606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x18672ac52ca4eeff3dc0f83e05a737f56ae0d15fb545590c309ceb6adbcefff3",
+                        "s" : "0x186f2b5fa7681f0f214c5e03861bd161b9b520187e1bd53cdcc8590063a2d043",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1638g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1638g0v0Filler.json
new file mode 100644
index 000000000..e6e0c6361
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1638g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1638g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610666606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x86ffbd9464d40375946241fe7de03dfcb41887fd1fb5b715d0bcde38066fdeea",
+                        "s" : "0x31f2d1160eecc9c79b332f35e559fea00d5b64213253d5ff311a22a16e188d5d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1639g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1639g0v0Filler.json
new file mode 100644
index 000000000..10c9e724b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1639g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1639g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610667606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb55ff2dbdb82aafd095f97c502ce45c2739e98cffcd6f80ce91f28074bc434d8",
+                        "s" : "0x4eb92ff502276f4d77ba568af8e1e6a49894a5da79239ac9436ba71c6dcbff6e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d163g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d163g0v0Filler.json
new file mode 100644
index 000000000..ce48da5f4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d163g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d163g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60a36064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc8fb69af6e3d12b1b66f8c8d4c1dcf3e669124179056e2c8002f74e9726aedfa",
+                        "s" : "0x6ce06c8f4cb37be86dc6f3aa75b998622b13c03c9e8fedf96bcf5c91f4bd7764",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1640g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1640g0v0Filler.json
new file mode 100644
index 000000000..fd8279af3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1640g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1640g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610668606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4a6671695d9fdbf3ad13a85aa67d93654249bb32cc7d70b89ae41fb9d00917d1",
+                        "s" : "0x3264218e4564c0b6e478e6d1c1f8c9a023fdba3f59d80c151205e888e49c41f3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1641g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1641g0v0Filler.json
new file mode 100644
index 000000000..2224b9beb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1641g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1641g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610669606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8f7c90b994aef818536e81d4473b1ba6d81115f759fc8e11b1c16a5c7f77a4de",
+                        "s" : "0x11f17354aea6456e5b20e0d788fa0330279b95cef1557c44c470f1e9130038a8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1642g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1642g0v0Filler.json
new file mode 100644
index 000000000..c8123000d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1642g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1642g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61066a606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4aabcf0499a005c0992e2224965791361a89446293c89e713d019276be5cd2b3",
+                        "s" : "0x528afdae011e0948919b64c678de361981c0529728f7fa4d57797bfad77f642d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1643g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1643g0v0Filler.json
new file mode 100644
index 000000000..c8129af51
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1643g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1643g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61066b606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x51cc455798650ec3581533fc584d84bb720a412b9ed77d60b94646c0533a1db7",
+                        "s" : "0x102092621b21575bf7f1435649c3d0966051048990ac6702ba16ef075e5df31f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1644g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1644g0v0Filler.json
new file mode 100644
index 000000000..9154bd559
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1644g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1644g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61066c606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x77d680b622a8f9b89e1b31c84f987a93ff81ca6d7015070e819fe8402886d46d",
+                        "s" : "0x0c8874a9be4ccbc469416970b13c9aa01624157c37825f7b7b1f02bc066b7ebd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1645g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1645g0v0Filler.json
new file mode 100644
index 000000000..27cf6b44c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1645g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1645g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61066d606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x42c8dfa21238c53566b2c3af7dd357e39f8ce686a78fe763e1a5740db3fb6cc1",
+                        "s" : "0x5aad459265ad5265fec7991982c1774813670c43f4b51eeddabf739f8db3baf9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1646g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1646g0v0Filler.json
new file mode 100644
index 000000000..3e98ec5f5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1646g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1646g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61066e606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa66b5938bbe5855087f396ac8be56f6bb0c0dd5219bade9431226450896e3c61",
+                        "s" : "0x1616218007ab52cd96b9a4b5ff181de4a9751983da9d11a3a47800cf2688da04",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1647g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1647g0v0Filler.json
new file mode 100644
index 000000000..4d68ebecb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1647g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1647g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61066f606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3b061c032e547f0a5c3b223272203c5efd5bd8682069b4ffd652dd3c34072c34",
+                        "s" : "0x35a5170fd165c69353187273cac82239eae5594d839cb2d5543692f0480a05ad",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1648g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1648g0v0Filler.json
new file mode 100644
index 000000000..4f88b47b1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1648g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1648g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610670606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd05fb7d1fc07bfcecc2481993e87f13b5c1476034c2561d27e91611693c86916",
+                        "s" : "0x010a269b90973dd7f1710d7c46b26f2108847209b8ed67eddaae1041389c6a89",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1649g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1649g0v0Filler.json
new file mode 100644
index 000000000..1908b7bbe
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1649g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1649g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610671606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0c6f1872e39f17544f1d23f5171bfeb46d77ccf0394f4790231759e0111890db",
+                        "s" : "0x223bba651980697fb11dc2250ae017cb76d0b88f49c985cea5fccae7670f037f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d164g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d164g0v0Filler.json
new file mode 100644
index 000000000..6163a8d11
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d164g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d164g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60a46064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x40e0e193f520d031f02146705b092700c6d0ea96bd6e06e039b5da84eb3e1a1a",
+                        "s" : "0x39ace817157a69f5ed8e09269bac480c90e138d26f129f6ee78f7ff2444265fb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1650g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1650g0v0Filler.json
new file mode 100644
index 000000000..c68cdb88e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1650g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1650g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610672606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x63415ace32e0d6f4e252f498b0e015396299d269df9f9060d399337c72ccdecb",
+                        "s" : "0x55b9730d7dd9d30de701f375411372f60ed33eec6abe776ae9b5a9158ac447dd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1651g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1651g0v0Filler.json
new file mode 100644
index 000000000..0be87063d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1651g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1651g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610673606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x70bcf22580cea8207a5eb76397b6be8091f1aa5a8dd11df03c1a1aa6338bfab1",
+                        "s" : "0x48e38d403e4839b4f158c06fb98c24bc827dbee841232bb8f2c3febeae9c7875",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1652g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1652g0v0Filler.json
new file mode 100644
index 000000000..9e466eb94
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1652g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1652g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610674606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5d6c663b84730604591a1783278779a0ce23adc498011fea0b70215d8b1d6faa",
+                        "s" : "0x0fe3bf957f7f70ca5df922f2147f524a5baaad42b88d2acdecc0946684252978",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1653g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1653g0v0Filler.json
new file mode 100644
index 000000000..a4e58237e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1653g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1653g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610675606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc9200b49842c514fdbc8654c2c8a05c6c6aee3bd5c891aec0104e0b2decd2313",
+                        "s" : "0x59af2e3c011dd4f4796c2772f081ea8a3b94195fb505ab024b28e605d43a877c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1654g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1654g0v0Filler.json
new file mode 100644
index 000000000..b65a37ea6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1654g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1654g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610676606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xecb8d159633f065eb55be7927d77a1bcde02b48d479c24994acca97ad21a2285",
+                        "s" : "0x3be43b5211e21923ada6288b3ec0830a0881329e266972f128748587e5e60e35",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1655g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1655g0v0Filler.json
new file mode 100644
index 000000000..1ae3074e6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1655g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1655g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610677606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xce94ed5364152f8bf4617bc89d6b30834fa694c26809a9e342f7d8d96423446d",
+                        "s" : "0x137535cc147955792f29217d04effa5a7e5cc0b1cbb67f009c24bcdaa5031c9e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1656g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1656g0v0Filler.json
new file mode 100644
index 000000000..9a1030759
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1656g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1656g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610678606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xde332ff0fdc6ee9fd7e5637bdbbd529d0b723f6c6e150d91accaa6d1f99f8361",
+                        "s" : "0x1acef0133435a1836de1b26aa114f78b9f09252230a771c560c86783f4afaef8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1657g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1657g0v0Filler.json
new file mode 100644
index 000000000..a5081e141
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1657g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1657g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610679606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x76463f8cd9f909e9568507cf7ce6baf1087d0a1aa9ef9633e6b0b9c8a4622d4a",
+                        "s" : "0x54b26e8c412cd8dae6050617bef5450fd0c49c0738dbfe78078ab8823c782496",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1658g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1658g0v0Filler.json
new file mode 100644
index 000000000..cbb8eb8a3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1658g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1658g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61067a606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfe32f35e4d4e31b9f2fdb2f19a33c283a30e8ff2dbec0ea31bbc1a3edcc996",
+                        "s" : "0xa62453a7d5600c08a96bef780ef2d2f044b17219e86eb714a6d5d2ad4f2769",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1659g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1659g0v0Filler.json
new file mode 100644
index 000000000..a8c8c6552
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1659g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1659g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61067b606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc9aaa0a646be35ef5560aec1e0ea38006a50f073c973073c3d54fb9deead92f6",
+                        "s" : "0x51bf80d0d3b6311641cce5c2e2100971dd509c72c5926147ec84337294f371c6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d165g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d165g0v0Filler.json
new file mode 100644
index 000000000..153dd15c1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d165g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d165g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60a56064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x02fbf8f4c5590441265d04504f7ea6081b0b69fbc22d70c39ce00520b785fab4",
+                        "s" : "0x5bcbad49c2494fdb4e46162b099899b6bfd721ae3a814a27364e30455494de66",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1660g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1660g0v0Filler.json
new file mode 100644
index 000000000..028015852
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1660g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1660g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61067c606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5ddaf0128f19c0a3e45d6eb3471e516d29589a07d50034219a9b58cedc9fab4b",
+                        "s" : "0x26c83c12fea3904c09dedd743d4a42edf3b26906de6e4ef1f94b5219b8683340",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1661g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1661g0v0Filler.json
new file mode 100644
index 000000000..711f65fa4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1661g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1661g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61067d606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd3098f1b3d0034418cb386e0cd9255c0258c1af59ab57133160e7791cd1a63dd",
+                        "s" : "0x24d1731f653d51b6ab3e235683c79064e04ea101ce57876b9ad3b102db039fad",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1662g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1662g0v0Filler.json
new file mode 100644
index 000000000..cab33470a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1662g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1662g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61067e606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x482ad7caf8ef3bc5713a4d7ab335f26b6f2946994b24f99264037d6f30743013",
+                        "s" : "0x53b1876be1ae9976a10c616b9ad30159fbb59c5d9a5933ae62a678a155d894d7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1663g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1663g0v0Filler.json
new file mode 100644
index 000000000..98078f96d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1663g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1663g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61067f606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x66f199158bcc59451507028284c018a24f5de72c415538fd56a7445ba0c9f6b8",
+                        "s" : "0x047466a0e99e7361c9dff4b7e70795c720156ef98f474ba6d988021d094dfc59",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1664g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1664g0v0Filler.json
new file mode 100644
index 000000000..3858f86f9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1664g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1664g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610680606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8c57e186b9b8161ee3db49e6e2334c3e0998279deffbc0f3a94d0417200933a3",
+                        "s" : "0x5e567bfce4ec561630191bf2f74bb57ae6db7e17b4fce71346fd327c7bc579f1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1665g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1665g0v0Filler.json
new file mode 100644
index 000000000..16f765841
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1665g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1665g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610681606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x31ddeaabca273f2bff1c189f5c4dc619f9a6df8c1b7acb7646a4f57751ea3961",
+                        "s" : "0x0584927b746f923eca114fc5808a2a8ab3dab6b9a560c4a6cbfca7f0bfaf9460",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1666g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1666g0v0Filler.json
new file mode 100644
index 000000000..3e0f255d9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1666g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1666g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610682606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xafecd80d0c5d9e80f60cd7db16d6bf5499400b09d70b4bcfb8d938e05191eb75",
+                        "s" : "0x189b27b4dd395e93af741be01124d1307494913eb600e0e737c2b46fcfc5970d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1667g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1667g0v0Filler.json
new file mode 100644
index 000000000..109abc0f5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1667g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1667g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610683606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4758250c0ea9cec4f969f8a27cb4870426b7b36237f6b5afe967b9f361e83bf2",
+                        "s" : "0x24c7154773be45280baf946903371659c95da53c61ac87b57cd2bc3c8b410492",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1668g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1668g0v0Filler.json
new file mode 100644
index 000000000..2c16eb5c6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1668g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1668g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610684606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc40639fcabf17a9397f4f0344c7bfb80887c3da007a5b74e37953a7b1ab9762b",
+                        "s" : "0x40faa17698362d2dd89e56c79d9f51c7c4ab97a7a3e30e2741c4d4e312bf51be",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1669g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1669g0v0Filler.json
new file mode 100644
index 000000000..00be64272
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1669g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1669g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610685606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x24bf9a5ba3256efd1832d444264923d400f1208daab7f52a0f4066bf46c3e016",
+                        "s" : "0x1f6b6b77468fe466f7cceacb0869cc1a1381b021505f4a3c2a42010d99655460",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d166g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d166g0v0Filler.json
new file mode 100644
index 000000000..53613aaca
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d166g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d166g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60a66064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbadd37fd4612915f8f12290d6d67aa2a57275bb842c39431cc9a162140d2ff45",
+                        "s" : "0x28445582902066f26148aaaa00bd10fbd8a676a045edcccd3fe037953e0b7694",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1670g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1670g0v0Filler.json
new file mode 100644
index 000000000..74b00c683
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1670g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1670g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610686606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x113c8b55e6de715ed44559c1eb849492694edd9ecbf8dfc097768a9c2bd815a7",
+                        "s" : "0x0713013082709aba43774eab48eb6053f75b4bff9d9c9547c8dab1577cbf1bab",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1671g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1671g0v0Filler.json
new file mode 100644
index 000000000..ffbd71aff
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1671g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1671g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610687606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6a021208d2283947b6e29c5c963138d6022c57690e34fce002085ecfc3b6441b",
+                        "s" : "0x72a2f4c2e6fe60e2ff2b466e0e791556975980eb8c450c1059ee67e203b0fdca",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1672g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1672g0v0Filler.json
new file mode 100644
index 000000000..89ee1f024
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1672g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1672g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610688606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x83428395d90be0c7164b94874851a175417a20d5989aa329a038c78c2f235a12",
+                        "s" : "0x052cb33d906c3e1301f14906bcbbe9c49495536c67be50b185359aefea30c49e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1673g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1673g0v0Filler.json
new file mode 100644
index 000000000..3d766d312
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1673g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1673g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610689606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x720fda048ce74be43f767bb9690042608d6e49ad5594ef904ed5111df32d6515",
+                        "s" : "0x49e8e3f2888c5adc8c05342d1b736d5828f7011ec4a140baa9fbf8239c9cd792",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1674g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1674g0v0Filler.json
new file mode 100644
index 000000000..96262a0b7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1674g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1674g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61068a606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf7f7461a37156a4956ab5ecb755d31eeac2323812b82aa438ed15bbfd185c621",
+                        "s" : "0x6c76b351bbd61ed35130f602f21df2179c4f8f4c5b2ec32209816386adeed30d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1675g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1675g0v0Filler.json
new file mode 100644
index 000000000..97a9c2525
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1675g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1675g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61068b606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2f1d6c060658658517adf9f3800b03f3d988084d1a1f4d85e192dc2f98449a00",
+                        "s" : "0x27166ae7baed103f5ecf688db597682d7004de582b4afa214fa256f4a6479dcf",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1676g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1676g0v0Filler.json
new file mode 100644
index 000000000..3b12606c4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1676g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1676g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61068c606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdb260f58357cec83b7b6ca52b61ff46d55080b767dec3f16a5fe659ff4ed956c",
+                        "s" : "0x76ac9e05cd814fcf636eeb73e10fc907b8b763dccc800667c393d73ecbc28f11",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1677g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1677g0v0Filler.json
new file mode 100644
index 000000000..59607f859
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1677g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1677g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61068d606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf34eafad0d22b54832e0eb91c206d6fddc162a73e5a2efcad851a58625ecd1ee",
+                        "s" : "0x706846e39d65fd4fbc58d59b54228890ea3ea66cf2e9f6e04b3069ba4707ed7e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1678g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1678g0v0Filler.json
new file mode 100644
index 000000000..7a09f48d1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1678g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1678g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61068e606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x329ba47ee5150aaabe685aa98403d02c676d158cce8feaad0c792af6ceb36d51",
+                        "s" : "0x319c9ccc124eda4a967c4fd3dcbb3b4c34da640f2b28781df0793d53fc362bb7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1679g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1679g0v0Filler.json
new file mode 100644
index 000000000..19e7b1fcf
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1679g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1679g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61068f606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe4bdf24dc239823f6b5f5581e3849172f8a9b884afab9d7be89a41d32a714b13",
+                        "s" : "0x35521063b81c762638aed4bfd6811e2224d2b8f553c03f52e8f03954408a24f7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d167g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d167g0v0Filler.json
new file mode 100644
index 000000000..c13dec481
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d167g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d167g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60a76064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9ae0f4b7fa38d22b302e5855dbc9bdd50f2ecdf4fdc2b5c560c629b53c12e7e7",
+                        "s" : "0x7b725583218a89c2c5a1211413a84c3635f464c7d1f6aa70cf97f31705ff9d7e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1680g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1680g0v0Filler.json
new file mode 100644
index 000000000..85b6f74fa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1680g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1680g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610690606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf4266cb4fbe36c77578f63fad2ab13f2d993edf47289ef873f7c69a40fc014ef",
+                        "s" : "0x1a09540098a664c630546012a8740d7b7fbba5f7edd6505ce254d5ed44afe4c0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1681g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1681g0v0Filler.json
new file mode 100644
index 000000000..28e19b1f0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1681g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1681g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610691606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x419c7292985fa50e5be697c7dd7884cf2f086ec84b188e4bfd195d78d70da43e",
+                        "s" : "0x4ffab1a191a7d9a2ecf805b6c0d2d289a160490c62d6978f641f4bf703a7d311",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1682g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1682g0v0Filler.json
new file mode 100644
index 000000000..fa57e1482
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1682g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1682g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610692606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x92a2eb80155804e698b9e0bbff5c74a3ce58de4856030d4ee41749face65cb5f",
+                        "s" : "0x442ef103cf37c71f0f952abf32fb6bb6230c81966cb79638c4528c1009cc209b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1683g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1683g0v0Filler.json
new file mode 100644
index 000000000..efee475f4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1683g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1683g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610693606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xef649f0bd814f168f97d41fb4e6bae32331eebfadfc86cfa8ad09746e1a3cca5",
+                        "s" : "0x63d204f6b0eafdd897f0eb91b9d253193fa4f55060d3ab6eca96fd9945ec4966",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1684g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1684g0v0Filler.json
new file mode 100644
index 000000000..f93cbe58f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1684g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1684g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610694606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x09f6adbe4db1eacdbc967a2cf2e06b89e97ac2c8cdf65706312f827286708687",
+                        "s" : "0x071f5edde7213ecba86181f55b6bf09e38b5e692bab2136337d6438924f045df",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1685g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1685g0v0Filler.json
new file mode 100644
index 000000000..d324e4241
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1685g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1685g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610695606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4e524edeb3f933ecfa725a90c1ee22fd08baa39d26fb78acec37f0f74dd90590",
+                        "s" : "0x52dee7b4056f5ed4ef69b9cfcc41ad786d01f6cd9620e09f00ad8b30c0bbf815",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1686g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1686g0v0Filler.json
new file mode 100644
index 000000000..dd3e9713f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1686g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1686g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610696606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb8ccf7d2614089f4df42db40bf2e33639c6aa4ee9167ef270f51f4f12eef15ce",
+                        "s" : "0x67e9f7309b7ff2c9e4cdaca3b45f70c5ce9075c53e38424ea307b231e19d81ca",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1687g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1687g0v0Filler.json
new file mode 100644
index 000000000..9077884a1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1687g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1687g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610697606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdef05ca37ff4de26fbb80192833055f444de719bb2cbe67c2104c850698dfbbb",
+                        "s" : "0x08dc7dcb7baa201a43fe77c50eebc1a53ceb823d14515f1848691c0d9f73b79e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1688g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1688g0v0Filler.json
new file mode 100644
index 000000000..b08b063f0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1688g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1688g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610698606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6a1df0f167dac9db6ec3313f131156422c2fcb83d2bba67a7a581e61270a323b",
+                        "s" : "0x355d332a9670525f184885ac9f2c70079bee8b7d118de043aaba9345ec07653a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1689g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1689g0v0Filler.json
new file mode 100644
index 000000000..a1d83f0d4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1689g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1689g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610699606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa7a5a8d4c69b631f7bc8079abd9f395ab84a9fa9502a9c431f852238477f56a0",
+                        "s" : "0x75e815887110146225268be9b5f61f583b49ee04d2270efcb37d41e481ab1dc0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d168g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d168g0v0Filler.json
new file mode 100644
index 000000000..82fc8520a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d168g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d168g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60a86064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0b9fc36dfe3c23238ac72ce3a83df28d97cd490e73e2ac3ba775aa8506079e4a",
+                        "s" : "0x66dc076f0cd71d03bbc85b9e1b877b0d1457271d909bbbb3adb799ba159c83",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1690g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1690g0v0Filler.json
new file mode 100644
index 000000000..06852b491
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1690g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1690g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61069a606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa6565ed880385914eaf4a6c04ca1e7b39bd492cb319c8b208f72b421094b61bb",
+                        "s" : "0x33a3fae0ce280178bdbe1a72db10c53ae9fadb80a4664f726c6d892e91d36ae9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1691g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1691g0v0Filler.json
new file mode 100644
index 000000000..dc9f7b702
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1691g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1691g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61069b606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x52b11e19616ebad6c5c63711786f8283ab3d7995b1f89da5427cd5af5aa3738f",
+                        "s" : "0x3dd1d28335e5d70b9fd79559c89f0932490681b4f9dac70e8ecdbba0135ef6eb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1692g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1692g0v0Filler.json
new file mode 100644
index 000000000..f2c9fb4ad
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1692g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1692g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61069c606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x503f36f6f06d0dad9aedde08c3948e87180b9925d6eaff627bd765c20c82b3e4",
+                        "s" : "0x08f7391eb0f9de3c98fb7cbe1501ccc939e5b851c2e8584095ed740e48d59f39",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1693g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1693g0v0Filler.json
new file mode 100644
index 000000000..336752e0a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1693g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1693g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61069d606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf3a2a8167b4fb2298ab99a291ec57979618e9e8d4e1c7e124f6eca2005e44b3c",
+                        "s" : "0x64a72c6eccd6be01aa4522a4046df44513ed32a86c19b2bbe7dd34ae393b517f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1694g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1694g0v0Filler.json
new file mode 100644
index 000000000..e0ea6fcec
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1694g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1694g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61069e606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfbc8abf79e58f4e7e1f22c4adf698bebfb96ab7b3b8eca31cccefe72f7653d6f",
+                        "s" : "0x300c1419a096277b276e1d93227ee194bb5c3debb29d1a32b06507a86a2b9b35",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1695g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1695g0v0Filler.json
new file mode 100644
index 000000000..5ecf09ad7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1695g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1695g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61069f606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x31feabcf4f4cb391383b06471ca5d7ef4569e5a6c2226b74f8fd45621184a055",
+                        "s" : "0x75abf0d5383a8245363e9fc8f25cad6f377acc62566b9d0cd0f3d4eb242511b3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1696g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1696g0v0Filler.json
new file mode 100644
index 000000000..fe3b1f519
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1696g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1696g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106a0606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8b511734af6a1955772ec8d69b6a007273e95ca0269867b18748ccd4446d9ddd",
+                        "s" : "0xa2de262e2540da0b6d40a1c6792b0b3ea87bf3ea3a16a7b5c957d01f76591b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1697g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1697g0v0Filler.json
new file mode 100644
index 000000000..5a923b80d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1697g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1697g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106a1606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf88a54089863fe9384255463395f38e1c648a76110db0067cf742346a09de7d7",
+                        "s" : "0x48458159423467753030d63da16a3cad8fd6db37069a95c866b4876813c9e94d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1698g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1698g0v0Filler.json
new file mode 100644
index 000000000..5bdc7414d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1698g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1698g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106a2606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0b50f5104156c87dd225c5bd5dfab311eaf7eced9d5d4b17e2cc8c21a4f3aa51",
+                        "s" : "0x38cdc1e11498f1766414ae31ed120a4f3c2201e82e8ecec2f61320b6ff9b49c3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1699g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1699g0v0Filler.json
new file mode 100644
index 000000000..fa8b4b2b6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1699g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1699g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106a3606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdd58986da1879eb6416c6cd3c82002ce84e721e9f55f2c584d18f45345721ccf",
+                        "s" : "0x10cbe018fed82143a7bfac6e65a4b55e3e2f8187ac0e9dee6532d736e14309dd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d169g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d169g0v0Filler.json
new file mode 100644
index 000000000..9394a3b08
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d169g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d169g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60a96064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb410f0b1c16ed3b39dd68f62290709d56f35ea2262246dfcdeb48a09c4510fd1",
+                        "s" : "0x69c758f09fe1ce0245a9abc1567ea462230e9264a6a15bd6b89a7f5b8aad428c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d16g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d16g0v0Filler.json
new file mode 100644
index 000000000..971b71c95
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d16g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d16g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60106064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x62396f0675bc72bc82be6763b016e0761c27c1cdb5c836e20f3ef7de0ec38f57",
+                        "s" : "0x62a95b478dfe5b03dbc9c5ddb19a1c3de7922b5bb3ec1c5c60042db4137e49d8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1700g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1700g0v0Filler.json
new file mode 100644
index 000000000..b2ccbb602
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1700g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1700g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106a4606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xae1ffdc8b49713bf83a8eb0e7df2b284c2dcc50e2f315576fbe8474743da56a5",
+                        "s" : "0x667b426bdb57f1ae226b7fc9cc696ad08ff95f34bba5dd5750d1d02df01ac7c6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1701g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1701g0v0Filler.json
new file mode 100644
index 000000000..25d05cf13
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1701g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1701g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106a5606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4efcae30eedf33f88c009e94c2559014218eb62c65a6e88d7c67aaabf283c163",
+                        "s" : "0x522827215d181bd27a9b175586e245a37bdbcaf28ff1a56da92cc37ce40d1ba0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1702g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1702g0v0Filler.json
new file mode 100644
index 000000000..3fc402f14
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1702g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1702g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106a6606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf0b10d6620f920a572be6822e3f6896da13706248f38b778735df49d2b9fdce9",
+                        "s" : "0x5914a0c7624e7bcc93f09a0b2380b8656be31f8ee3973bc353614411d201670a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1703g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1703g0v0Filler.json
new file mode 100644
index 000000000..4248b42b6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1703g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1703g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106a7606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb55394290b4cb6591d953976c73de31e5357ea22255a56b17f8c118977aa84ad",
+                        "s" : "0x5801cb16380049cbb9148faac6fd748bef82088d5ef84c9f82c66d3daa7ae5a8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1704g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1704g0v0Filler.json
new file mode 100644
index 000000000..c1f1e5ff5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1704g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1704g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106a8606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb7accd2c99d549664cd4244210e08234f142f4f4cc191b2f88330b3ae6d0db4b",
+                        "s" : "0x122d308de8bad30d0c6af5270194d65d2845dd43bd118c6ce5c38fd7dfdd5999",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1705g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1705g0v0Filler.json
new file mode 100644
index 000000000..3bc1e2c66
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1705g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1705g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106a9606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1d0bfd0b23920a99f987d226315227f4e866b5fa01cf3a782bce459e820e44e8",
+                        "s" : "0x60ca0abf79579618d0e7124d3d3c0f5eafa6cfee90e9b90d95f6b1784ab67e3a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1706g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1706g0v0Filler.json
new file mode 100644
index 000000000..f43a3c5e2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1706g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1706g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106aa606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2752552dfe46e3964461e96625938d53b22a92a644d9d6cf7b50ce4d54312286",
+                        "s" : "0x0b987c8c301ffd92d157ac5bed8c9921e9947eb90bf025a6c35d9bd90f02c7de",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1707g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1707g0v0Filler.json
new file mode 100644
index 000000000..9c6cd52b4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1707g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1707g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106ab606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb75c0d15222a9f84916f6e68506424ecf132412a62d1e7a4cc7bc27d00bcc1a2",
+                        "s" : "0x4e7902043475b5d0ebe703fda2a77a1c2ab3b0e99165b575a2b4a194939f274b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1708g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1708g0v0Filler.json
new file mode 100644
index 000000000..48c8e6430
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1708g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1708g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106ac606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf59439dd272652368c5a50fa7487d7f694ac71f94dc9f659f9495c232bb74ef3",
+                        "s" : "0x592065bb3fee77e5e3c296b6641ee7dd8cf83ae7aeff6f2ceb65fee550cc85c0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1709g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1709g0v0Filler.json
new file mode 100644
index 000000000..1584f71a5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1709g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1709g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106ad606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d3d4e3e6aca0fdcab53b574b2d6afada4b541a10cf76d7b223cbc00aa5d0311",
+                        "s" : "0x3a6390a111d49355330cb2b200da03657efd194be73d2f20b58316f2536b9fa5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d170g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d170g0v0Filler.json
new file mode 100644
index 000000000..05c59d8a2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d170g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d170g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60aa6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xff5ff2c70517db81de484263ee6c3d28e0ee8babb290cc2988565240f8ebc817",
+                        "s" : "0x015e75693bc27ef700e5c624edd51d10135a98d0829c446f1ea1f21ec97bacc4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1710g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1710g0v0Filler.json
new file mode 100644
index 000000000..5f3cdbabd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1710g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1710g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106ae606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x178fa1180e98878cae6147abeb5eb2f276ef751eff026e0f3329acb82d768a80",
+                        "s" : "0x3c0f8f2e09c30350117823589cbc90531dbd92c4f8dcb6e1e22b4e091a9e142a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1711g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1711g0v0Filler.json
new file mode 100644
index 000000000..272ea30c1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1711g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1711g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106af606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaf9e8c8f5eec95bf00d8d91d070d6e0676bdbf5ac6338967460bd16b7d6e9c03",
+                        "s" : "0x64db4c6025617baa8e4ceeeb026cda52f736b44c4cff8874bbe74588f046745a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1712g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1712g0v0Filler.json
new file mode 100644
index 000000000..279dacb14
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1712g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1712g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106b0606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3662cdabc5360e39199f7c361e6c9b500b3ef4f1285aa38a7c64d9a071b3c0c1",
+                        "s" : "0x229fb768ce0a63bde195f0200a14bb696bd79161f292cbf097eedc44b6ee450a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1713g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1713g0v0Filler.json
new file mode 100644
index 000000000..e47aaec98
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1713g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1713g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106b1606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x062f2fc993e47603f54636c8c426e7816f029ae689967c56c85807709469d497",
+                        "s" : "0x1c56779e722ddfca39be1e9863ee3fa97cfa5a40df2070e7fc2fe62d772e8e46",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1714g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1714g0v0Filler.json
new file mode 100644
index 000000000..976efd896
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1714g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1714g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106b2606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7348c47b3e254add2cd08ae1921bac36345abafb5df9a72ed721883ca79617ad",
+                        "s" : "0x02416c7c0e0a14a2fef0cb44cf766414266fe0030bdeec6bf0f663fe921c5800",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1715g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1715g0v0Filler.json
new file mode 100644
index 000000000..897a56c3b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1715g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1715g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106b3606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9d5b0eefc201617e31d7c720725706c7db088e3ec33cf84d32d73b23a6c7bcd3",
+                        "s" : "0x04143df358f8c66d594d335dc56cb379d7497b41ee8d2a6b72f78fe8e595687e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1716g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1716g0v0Filler.json
new file mode 100644
index 000000000..0ad3c03c2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1716g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1716g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106b4606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbe9e16a8f2c9a120b64f89adfc08b95e6aa1a90417495b00783887c348759169",
+                        "s" : "0x03dbf68e697ade21dd80dc01e5bf7699f096434fa4b91d17b15fc4dc27bb975f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1717g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1717g0v0Filler.json
new file mode 100644
index 000000000..f37c1c2b5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1717g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1717g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106b5606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x60b06d8f9202ba0a9be5512ff01d11b6ea89c345a3caf6ceabd67ac5442d06e5",
+                        "s" : "0x021218d5c5d828ba0308883f21bb919d5eb105c24f3e00924e4d162a8c0f9049",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1718g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1718g0v0Filler.json
new file mode 100644
index 000000000..847c9749c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1718g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1718g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106b6606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc76f17ed9791e79d49344a6d22bb97100e9073751ee8e844de970dbb91975ec4",
+                        "s" : "0x52eda437b46de20e7d3520eb8e117cbc0d75bf1f190fa896dafc6a1b1b009f5e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1719g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1719g0v0Filler.json
new file mode 100644
index 000000000..c34216bc7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1719g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1719g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106b7606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc626871a3377642520e21175d23d4f13359bb0ba7d9e9c9f23c18e6ade95e623",
+                        "s" : "0x12513dd5ad9c6fa3d95529b773ea55f98cc7042396f07052de26c2d6d125f141",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d171g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d171g0v0Filler.json
new file mode 100644
index 000000000..5a36597ab
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d171g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d171g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ab6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x30b1c412597ff21f710b7eef79833de09ef5b66fca325d81f899dca50cb722ab",
+                        "s" : "0x2a44e6701138e480c78ad06290259e0218bff9b03566b9afcaf4c882e37be16e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1720g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1720g0v0Filler.json
new file mode 100644
index 000000000..34d709770
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1720g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1720g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106b8606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x06ee4e97929f663bb22883151c7320ecd26d260efefdb48c3c68c6b4300297b3",
+                        "s" : "0x76a95da51ed899b6cdee66b3b04544476d5687fe21aea1d24ff3e2fa5e969675",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1721g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1721g0v0Filler.json
new file mode 100644
index 000000000..195842aab
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1721g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1721g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106b9606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5e67b9e178ea10e64662099ccab33bf0810db03033a2cdda89177b43e8f03a10",
+                        "s" : "0x666cd488612563588b49ea4ef59ae6aca641007308ffac803a190d0b06f0eb6e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1722g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1722g0v0Filler.json
new file mode 100644
index 000000000..945427c93
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1722g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1722g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106ba606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4188aed2a847c93de869b0e676238731e39072eb2d99fbc302784e47e832f9a7",
+                        "s" : "0x3f70deecf7355778be2df2c7785a24e1f2140b4dce1de76eebd6bbb7629a2407",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1723g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1723g0v0Filler.json
new file mode 100644
index 000000000..814982bda
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1723g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1723g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106bb606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8adfe232e21d590964eaa7404c1b69c9e2151fe1ae0bce2ec9655d6f6f62cf0f",
+                        "s" : "0xdacb53d65d160cbcb2e417a3f5c61af1de38bd7eee2036e3750cf9eac6be95",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1724g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1724g0v0Filler.json
new file mode 100644
index 000000000..8b795269b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1724g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1724g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106bc606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe01decdc84a9499ef8de8e2d553be4a267efe0f4adce08c58f3c8e6a6b3ed25a",
+                        "s" : "0x386f3225cf9b59725df2307676bbcf81ea14d324bf14fa40a84f62841f67bdab",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1725g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1725g0v0Filler.json
new file mode 100644
index 000000000..a74372a02
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1725g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1725g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106bd606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x02f468b03655876f13cb00de3a31f52b7e822df3481a857c8e59375ac4466a78",
+                        "s" : "0x111ab6d86b2e41df106d793b2e535de9fe37e3132a3c72bf22f7cdcda99a7074",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1726g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1726g0v0Filler.json
new file mode 100644
index 000000000..90af207e2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1726g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1726g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106be606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3e65bcd4a36a3992dacd6bfa5498917206946d36000d0f31833b7fbaeea2a028",
+                        "s" : "0x1f17016a463bab9bca0624693ed4b5419221b19b56a5890c2bed82e2b763ebe3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1727g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1727g0v0Filler.json
new file mode 100644
index 000000000..387e761f1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1727g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1727g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106bf606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x39c59429ccfd799a60087461e6c09e2581e877deb8430bc0b5ea72c357f6fc69",
+                        "s" : "0x3cd18732f9613db1a6f4f8e37b4d9ca00a95eee82e4d505f702a282f9d792fa9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1728g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1728g0v0Filler.json
new file mode 100644
index 000000000..6844d5b96
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1728g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1728g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106c0606452600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x375b791237ad5ad65ce414cd8669a654c36201a087a6fadfffe474500cef110d",
+                        "s" : "0x48f7107de8ebb40841b2b57ed31ad67759a6b57b501fb01e20e7db23d7b01bc8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d172g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d172g0v0Filler.json
new file mode 100644
index 000000000..4c32d461b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d172g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d172g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ac6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf62832d4b90708fea53fc5f3a5cc9f9f4d2cf979893e3e122f866797cb594b1f",
+                        "s" : "0x2eb56103def9e3b1d4b40e725a5437389bd1d6e454712f6b197fdedc8d4258b3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d173g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d173g0v0Filler.json
new file mode 100644
index 000000000..555b289d0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d173g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d173g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ad6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x519fb2bcf38fbebd41ec860bccdf21e80993c4096f251a83597bffa0ca4981e2",
+                        "s" : "0x7c922c0d64f1ac53abedb134fdbc66e228ad3f085d930651706b556f861ef1f2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d174g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d174g0v0Filler.json
new file mode 100644
index 000000000..26b5e8007
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d174g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d174g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ae6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x19d02df901cb0797defbde1fa2a5b138d4144a9c7b5614a7a6fba946663c76b4",
+                        "s" : "0x70ff2751e84adce421f93450bea92c0f6c7ad6c8e265762347e6bb9d31d33c34",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d175g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d175g0v0Filler.json
new file mode 100644
index 000000000..38824c17b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d175g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d175g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60af6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe52619eefe8c77da2f15caab940c0a8d161eeb77a49809ddb9372b9b5662ead3",
+                        "s" : "0x51d111763555f72b81e22db7adfbc3d648429705d31719088fe4f9603bd0982e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d176g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d176g0v0Filler.json
new file mode 100644
index 000000000..1f7a7378f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d176g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d176g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60b06064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4fbc35c5d39274c3db8a35bbda8d94ff4daca5988de78f86679a1404cd6cc51b",
+                        "s" : "0x28b923e89dc0a9fd305f0a8d8508aabceacdd1c94b7af07740f655294decb508",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d177g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d177g0v0Filler.json
new file mode 100644
index 000000000..51f87a5d4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d177g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d177g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60b16064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa229fb68ab11a5cae27970341afa49de82a0fdcfc834a49d4787eb17c54ad1fb",
+                        "s" : "0x279e1e2f24d1714aeefae88e1bbdadb6e4d1b7b25d91cf4cada2ad6d9aa18e5c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d178g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d178g0v0Filler.json
new file mode 100644
index 000000000..50d072491
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d178g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d178g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60b26064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc31271d6ff32c50c0b27eb489bd526485f1ef65dabc1f9b4040647fcc76b40d6",
+                        "s" : "0x1e8f4aaedb344a2e5e752c7164cba7bc89aab38ca47b6d96e88569371bd240cf",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d179g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d179g0v0Filler.json
new file mode 100644
index 000000000..64b408592
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d179g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d179g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60b36064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf075c62f0e3ec15bfc9a27668a911434ceb7c5142014a3d3296ac21d94bef597",
+                        "s" : "0x33842c63ba81ac442b0a047f92670e5b0b625e6b40617ee6ca3e0841c811c2ab",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d17g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d17g0v0Filler.json
new file mode 100644
index 000000000..b89c38a5a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d17g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d17g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60116064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x503de310a458075a53a818ffdd0e4ba0af9e4ca1abacb43df7b28c52314727d9",
+                        "s" : "0x1dbf82d925fe7a2b4c85b5375b0338ed34fdb80e93642a1632692eccd348f24c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d180g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d180g0v0Filler.json
new file mode 100644
index 000000000..94101630a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d180g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d180g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60b46064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7b369f3578d2d2077ba85f797418b3c7c5cb387e89c4e88926b674f6792269ed",
+                        "s" : "0x2561fb72af0ddaaa45b8c62c606fe8c122376866293ca40c162e8a69319bbc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d181g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d181g0v0Filler.json
new file mode 100644
index 000000000..e98396329
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d181g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d181g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60b56064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x293cc005a7d42515b181a683f79bc35a15d7010e5e796d4a352757b75af9121c",
+                        "s" : "0x6330eb23962560b8475b833910062759e96de7ca2a41a2e4e5daf1de3b92fda4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d182g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d182g0v0Filler.json
new file mode 100644
index 000000000..ba3e898e1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d182g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d182g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60b66064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6523aa9f31f3bb9d8911df3b704eec2f608b0afa7f2af324f6d7d7b1982ccbc0",
+                        "s" : "0x1d8a9a0a66cd2e0c0dad1bf4964bc377d790427a47793bdf6268557739acfd5c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d183g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d183g0v0Filler.json
new file mode 100644
index 000000000..f0ba2609a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d183g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d183g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60b76064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8eecc2f0ee35a6413db13034b4fec67920eaa55f0d4c480f464abe34f38a15ac",
+                        "s" : "0x3c89c044ab90593d8a4f2c78e2bb2a3a3669ddbc4528e49cb8bf9d327e5e1483",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d184g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d184g0v0Filler.json
new file mode 100644
index 000000000..f0f7bffa5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d184g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d184g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60b86064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x292e0e1e52b47dd7b77d670cab1e455e26915b0e42ab5dff4193b6d6e7ba91ed",
+                        "s" : "0x7ed6018ae5206366643952f845cf0257ecd90e1788ae68d14b64bfdaf66e86d8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d185g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d185g0v0Filler.json
new file mode 100644
index 000000000..e9843dbf7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d185g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d185g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60b96064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd28937fb4f1579581d831bff1fbb867a18e1d7a6ddd10cf045edd894688d98f9",
+                        "s" : "0x4869b3084727c2fde0a3f82605d83b0f80699b02f2b3875e1f4b615d0adbddaf",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d186g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d186g0v0Filler.json
new file mode 100644
index 000000000..d2f6285e4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d186g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d186g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ba6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1255947e690e85fa54b1c8bf9206174b376777c712adaf75fcf50bebd057b143",
+                        "s" : "0x1f623b2bfa18c9d2dd6084f251555cea91f3d36d1accd7a8f36fb728b1fc131d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d187g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d187g0v0Filler.json
new file mode 100644
index 000000000..e66da7629
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d187g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d187g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60bb6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf11e826fd6dd9ff71b905397a3ddd6a2884bb304c38ceae3a9fbd3234a7b72e8",
+                        "s" : "0x6532ac8aa6028f71be107d6ecfa2386220580b9f93922d40f467cb5d123330d4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d188g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d188g0v0Filler.json
new file mode 100644
index 000000000..62f9eb7f9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d188g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d188g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60bc6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xedb854f67f433fbf210278f35fea1f2250f228c5ee322951fbd8e8a961d5b359",
+                        "s" : "0x797a9be8a71911226df950ac4550a94a645ea56bcb0e63029efafc2dd7a60510",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d189g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d189g0v0Filler.json
new file mode 100644
index 000000000..d9c5bf651
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d189g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d189g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60bd6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4c1646cfc61f1e0436bfeb43ca69abe75ef8baa2e5764563f1a1eb3c78726ab4",
+                        "s" : "0x700499f8e574a091c866569500c83485fcecd8c74574c0898a9ca661fe668cf5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d18g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d18g0v0Filler.json
new file mode 100644
index 000000000..34d52ee59
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d18g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d18g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60126064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x97963b53a45f746d0785c3df675e62acd42fd9c7d88c29a45676864bd5325773",
+                        "s" : "0x33a90791a703ca8759c728e7766fd15e9db5071b0e476b741311f81e8807d827",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d190g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d190g0v0Filler.json
new file mode 100644
index 000000000..108df8c37
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d190g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d190g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60be6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1780ba93ef39d97248bc0c48720e8291493673e7b8da52c681f62eb705778b2b",
+                        "s" : "0x24fa98126591dc7d7d88634d3656171492508a20747e77d321b60a290e0ae8a6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d191g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d191g0v0Filler.json
new file mode 100644
index 000000000..c718c0b80
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d191g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d191g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60bf6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x96635c5c7643881781845788dd3ce2699d27ca4103d9b52918ad82aff45b3f6c",
+                        "s" : "0x40e3196e21d953843c6e256dc4a79b980c17c3e179ce51c5ef45bdc4b2350341",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d192g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d192g0v0Filler.json
new file mode 100644
index 000000000..0494d745b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d192g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d192g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60c06064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0f3892a9588a91b42711c8c290533e6a76d13fe3e50a783e8898960fb0cbd959",
+                        "s" : "0x66be59cb2e4a993a28e283a1ca29bc7214baae3ae840ed62060f5baace68d01f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d193g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d193g0v0Filler.json
new file mode 100644
index 000000000..def0c546f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d193g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d193g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60c16064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2e25d94648de014ced2fad7175fb944420ea0f74d5966f315dc1dc78d80793fa",
+                        "s" : "0x7c0c8adb62c13e41aad117e008a1d08831681926763fbc0f40a21acace23223f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d194g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d194g0v0Filler.json
new file mode 100644
index 000000000..10e0e6df9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d194g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d194g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60c26064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe631169d51b6442cd00cd16411e7b258f0fb0724d3b0dd197111f96d4ca52dca",
+                        "s" : "0x518d9ce705649fd72d0ff803aa761b73e4a6044bb751732a7886ed861a0b201f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d195g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d195g0v0Filler.json
new file mode 100644
index 000000000..f10b0bf57
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d195g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d195g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60c36064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x12c2f684d0261d87d8b49ee0c76c334cdc3363ada2beb9d43ac9c6903067262f",
+                        "s" : "0x4a12c47042e1549f126c0f9ea895d5e402c18ed2c9347219fd699688dac88c02",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d196g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d196g0v0Filler.json
new file mode 100644
index 000000000..9d3aa3a42
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d196g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d196g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60c46064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdafeb3e95bcbc793d6f583a5a5f0081995a84df22f86c5ae92264755f0538cb5",
+                        "s" : "0x474e999d4127270beadc6c1aea131fb12d247331d0bade785712dfd8f10fb8b7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d197g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d197g0v0Filler.json
new file mode 100644
index 000000000..de3cc8e4e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d197g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d197g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60c56064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x93877a7500b1ebd1713645a903d7a7f6b6b4f2322ee26d62afaf59304f569452",
+                        "s" : "0x51717c7740043fdd29205a08cf7936245e169d2997629350e72259c3c1de5865",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d198g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d198g0v0Filler.json
new file mode 100644
index 000000000..f86fa1633
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d198g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d198g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60c66064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb778a7efecc4fc7c4d8ff2775192c65391fa94fd3862188d53e3ce99ab6b11ae",
+                        "s" : "0x685267bc7a76344568a52095b18b689d5bfff14a6efd42b72545d1d754e15096",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d199g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d199g0v0Filler.json
new file mode 100644
index 000000000..f1d5f8fa7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d199g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d199g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60c76064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x085bdd62d5d7ceede5b5219792f62f798c861719a697106363f1573eb03bdca3",
+                        "s" : "0x301c359098cf4b2891c6088e597f5381e278ecd20fffe450ab22213d161660d0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d19g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d19g0v0Filler.json
new file mode 100644
index 000000000..4f0230d89
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d19g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d19g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60136064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x119f2133c526af86f09ce51ec9932494e38994fe02e6949907939b00602d7eec",
+                        "s" : "0x1b202a26513de4884cebfc945262ae9655311fd4b3fbcc04df6305d787a24845",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1g0v0Filler.json
new file mode 100644
index 000000000..6551eb5d1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d1g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d1g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60016064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2163e4573e52205853ea3685b0201af1f3c9d6e94b491d74792f6c54723bea5e",
+                        "s" : "0x4778618482b52cf22347889f6c5645ac58c9993d33412c0ac9e8404ffec942cb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d200g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d200g0v0Filler.json
new file mode 100644
index 000000000..1f66efc15
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d200g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d200g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60c86064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x738a0383a5526bbb822749ecc97a52fdb0eb85eb7e83610940cc77cfd20ce26e",
+                        "s" : "0x661ccfce72b7b45e9cbf327e6cecc342f679db50d242e84cc9c896842a2c3eee",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d201g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d201g0v0Filler.json
new file mode 100644
index 000000000..35f20d16f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d201g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d201g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60c96064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x47974eee006e5d2bf2956aac973ea88f677771de3fa2cd8004072d08c40a96cb",
+                        "s" : "0x528483e39af370f2632d4c9d4ec732e8ca1db405be8f25aa6f37b5ef322c2ee1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d202g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d202g0v0Filler.json
new file mode 100644
index 000000000..e3240ac48
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d202g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d202g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ca6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x605af676f4f22de1250896f3d1cf376a98e61cefb83ff261a59f1bd5627fe03e",
+                        "s" : "0x70e7febb9f56a77cb7d96bb924b13d004591f76c999c567f421eac7ee1d0df53",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d203g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d203g0v0Filler.json
new file mode 100644
index 000000000..074905890
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d203g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d203g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60cb6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9cde1f5eb6f4792eaab423f8b7b98eb9eca45e012fd9bbdc31350a976d351f27",
+                        "s" : "0x48785108ee1205eb8741d249e27445e5243d3b136443149e0aaf1f75a663df14",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d204g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d204g0v0Filler.json
new file mode 100644
index 000000000..e89541643
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d204g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d204g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60cc6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x78b781d38c545edb4682e8a9e8bfcc94ee7c0f2aed5b5d1289a77fcf5aa36e50",
+                        "s" : "0x2cbf1b12274fe4db56170e90b52c49b4e71a23c41d2b15848cbcd00b3cdc0a84",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d205g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d205g0v0Filler.json
new file mode 100644
index 000000000..b1d551724
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d205g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d205g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60cd6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x589a865ebd17844b6ce2c46314649d99a582669702c0d84fd4f4abde3d589f3b",
+                        "s" : "0x6fc277223a038d509b493d0235920e2ba7fb12c4f28cbd0ab86c582b05def8bb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d206g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d206g0v0Filler.json
new file mode 100644
index 000000000..7aba8dbc6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d206g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d206g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ce6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x91125f329a2244ec80ad938e4d43aa79f5afd96d6c0e246ec1faa9213fd1fae0",
+                        "s" : "0x33cd91551ce38d14267bced763e0f6ae05079c7a702455e82c9be6ac064adc78",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d207g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d207g0v0Filler.json
new file mode 100644
index 000000000..5768e8645
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d207g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d207g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60cf6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcab2acf0a9b0eab55d31a1cd8bd0c4355e0461ca9c7300c15451ab51c899786f",
+                        "s" : "0x558df0e819ef7251c5b829016d4427608c23a98b7c3ed87dd636399bf6f379f5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d208g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d208g0v0Filler.json
new file mode 100644
index 000000000..bf3235b0a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d208g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d208g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60d06064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x679300b111c081a132494f09b84a062bd39c427f38088769c900941544db2a74",
+                        "s" : "0x725136a6504ea6ca1034d45606fc15ab8764f6019855c1a648145855628e029b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d209g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d209g0v0Filler.json
new file mode 100644
index 000000000..4a1330112
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d209g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d209g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60d16064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x62e53e09291743bf56c5ab840e297aaf345b5ebc36af46e12c6f04287bc56e0b",
+                        "s" : "0x33af782e7c9385c51045f563456d5a2e9de28bf63629be34f3e6b144851ba1e6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d20g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d20g0v0Filler.json
new file mode 100644
index 000000000..3cde3d970
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d20g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d20g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60146064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x87bb16b1e27eaf2ffd4017ac8ee6009dadd96975aed7a3d0daa97bd99f9c8f6f",
+                        "s" : "0x2a60f632a674e27b32494253f32436033c21fb73e6e5a4be29c43a8b5ea918b8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d210g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d210g0v0Filler.json
new file mode 100644
index 000000000..512915236
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d210g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d210g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60d26064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x70c1f9300621c6a7776e3216918e4571e827d26a6c942e2fc539df31d99115ec",
+                        "s" : "0x4b4f50e46281389823136edce6c316a88e108b40dc5ca9fe5bc77f584ae41b07",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d211g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d211g0v0Filler.json
new file mode 100644
index 000000000..3e11a5d31
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d211g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d211g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60d36064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x04c1d0b291d6b2a0907df37b227aae0e5947a6d38c2166e3c4a68610b1cf576b",
+                        "s" : "0x0fd0df6a5fe8203470dcf0854e0efef6541503cb35c1e2562107bfafa95bb06e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d212g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d212g0v0Filler.json
new file mode 100644
index 000000000..9cd603e94
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d212g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d212g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60d46064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6614ac391da561486e943ffc27bb91cf443ef8438eddd838832c8201388c33b8",
+                        "s" : "0x440f81fa37f80c6db8383c5cbb8e189d61f8df9cae049c0f8f63363e87588566",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d213g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d213g0v0Filler.json
new file mode 100644
index 000000000..789522200
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d213g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d213g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60d56064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x58d3bdd5a008ca30635439cdf332805864cb93c51963c19d81d7eb376ec37639",
+                        "s" : "0x36405291edf9fcd7c371c0dd0a700ced6f84a81c1a5aae65d2edbed0f6cab6b8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d214g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d214g0v0Filler.json
new file mode 100644
index 000000000..b69176573
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d214g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d214g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60d66064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbcd5e787dd54687f45f906f034c3c38134b8ddbd6afe01230250d763ec52e2cf",
+                        "s" : "0x7c3d7ef470ca1fe6792914e469c1255135c8d2f813ff0414b34f7fd2d9ca7bbb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d215g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d215g0v0Filler.json
new file mode 100644
index 000000000..b18a5567c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d215g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d215g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60d76064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7edb49ec8a85b5a7b1fc64c26b3e4476639d2be213d62e2392aae24bbe24fdfc",
+                        "s" : "0x3053ee999ef857f217352ef83eabdabed1d784a63135ad5f49e81d1ab2dfeb46",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d216g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d216g0v0Filler.json
new file mode 100644
index 000000000..e83c74ab3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d216g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d216g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60d86064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe685722d726a84ca364e4d522b5f62e0bba276d4bc086491be195a92c14c275c",
+                        "s" : "0x7f94b3684f0f92653b704cb3a26b17a17efdaf336b6a360f56d58574b7a13285",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d217g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d217g0v0Filler.json
new file mode 100644
index 000000000..850c751ce
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d217g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d217g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60d96064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc38776a3769ff9b7ed7ad272197c1116794548eadd9f0e240c4b2f1e23717421",
+                        "s" : "0x0a45f587b3fdca3c0a848abbd77703e7f645aef3f93f5df2714e36d7d03e3cd1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d218g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d218g0v0Filler.json
new file mode 100644
index 000000000..f91d3192c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d218g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d218g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60da6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8c83822bd2c19fec04e84d7dad0209619757c5a188999aea0aaa42ba9264ad95",
+                        "s" : "0x4d0bd78b0f07bdae760452d9310ad30cca3bb5ce0c43463d77b49f0a8019eaa6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d219g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d219g0v0Filler.json
new file mode 100644
index 000000000..b8123ed84
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d219g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d219g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60db6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc36210431662eae20a2b8f67316b9bc3d2b5f3bb0ea0e8c49779aa1689009104",
+                        "s" : "0x6284101e5e1527ecbf777f47b88b5b6b652a2d4bc64d6d2484f6a32d353c6094",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d21g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d21g0v0Filler.json
new file mode 100644
index 000000000..998261391
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d21g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d21g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60156064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa68d14ececd723f5a15a14455a1c5bff94367b1b51b283ba9bfaa7193138fd86",
+                        "s" : "0x340986be811e9053e26294854e1fc3c0238164a7525a1489e78a088fd8acbb74",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d220g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d220g0v0Filler.json
new file mode 100644
index 000000000..2c660c4b1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d220g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d220g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60dc6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xce93cfac142bd5f850b02db08e1464445318a93653f9a001d9f39d2c84d25520",
+                        "s" : "0x50b02fc3243c6c0ab0089af161e87464765cc311fe05ae5242236408ab36b31a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d221g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d221g0v0Filler.json
new file mode 100644
index 000000000..03173ac0d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d221g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d221g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60dd6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2c1a76fedba5f15ba71e16046bc1ef68f50e8fb9d197d1747ce4696f34159286",
+                        "s" : "0x7bfaaa4cb68906cde05e49f6c3fba617bf83e2a2cbbf8b701259d4973740cc95",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d222g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d222g0v0Filler.json
new file mode 100644
index 000000000..2d62d9946
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d222g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d222g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60de6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7ce2c7fc58ae07120cab8d74851042bd7770bfebade25f4759c4f3d7529cc21b",
+                        "s" : "0x335d53e44bb59d8fd45c49aaf0b2bee17618da4be5de585b997e14c4c0dc0c2b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d223g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d223g0v0Filler.json
new file mode 100644
index 000000000..662f7f285
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d223g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d223g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60df6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa32256ae3bc73bc7a1e03d0b0ab160120008e2981d7c88a21e92fb0389d8efef",
+                        "s" : "0x1a5a41ac400b0a999216e0ee2f7ee3d4bea7759ad40e397a97d7e778075bcffd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d224g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d224g0v0Filler.json
new file mode 100644
index 000000000..e7c6e6940
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d224g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d224g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60e06064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xab69fadda2440726d95516f3b73e366df58663a5846d575ea56694bfedf3afec",
+                        "s" : "0x1969cc72221beef741cfe9255439eaed14bf7e6ecb8a88d7e6138439ee1caf00",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d225g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d225g0v0Filler.json
new file mode 100644
index 000000000..42d65173e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d225g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d225g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60e16064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x61b0297e127e10d3fca1f82ab98b3faf7514732c1aa40e850d527faeb69220e9",
+                        "s" : "0x48d09c86fb31ffd11257fdead69d84c69705e6eff06b3d9559a5bd7f80556637",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d226g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d226g0v0Filler.json
new file mode 100644
index 000000000..2e19cbd30
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d226g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d226g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60e26064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf9b2261602bec38026e73a028964fb88a4db65413bda05a606ec7501a6740e11",
+                        "s" : "0x478f0421e449743538e29f28f1a2191be4e71bdaa5015b934aacc565cd013ad8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d227g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d227g0v0Filler.json
new file mode 100644
index 000000000..cd1e24cb4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d227g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d227g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60e36064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x94fbdb23daf793891d8b6192eaa4d6a2aab0540a214a16d5dfe3b82c7b089fcf",
+                        "s" : "0x3b39dc66df5b0f4d45fec35d23bf536067ba50dcdbd53adbcea54dcaa47a8d32",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d228g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d228g0v0Filler.json
new file mode 100644
index 000000000..2977e2ae8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d228g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d228g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60e46064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe3b5e6307620f451253ad87bae4b5519a4f41b084e6eb3f801a94ffa552f4d47",
+                        "s" : "0x657b9d72c7846b5de6788fc92473d7be62170fa058e0a4e6e8e745ab850c8719",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d229g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d229g0v0Filler.json
new file mode 100644
index 000000000..4ce259671
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d229g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d229g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60e56064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x96d2503fd6b1d0ac2e9d7355d0d5ac091a7d5ab9717fb3c8ef8be72fdc9e2052",
+                        "s" : "0x088d93170c8ec909e1391a9d0d0080c5b01bd34c28c167e21b72cd4588710b8c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d22g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d22g0v0Filler.json
new file mode 100644
index 000000000..dba37c012
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d22g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d22g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60166064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa049186a3048f474d55bc36aeca9ac481f76b487718fb89f33a7e603f1995ac7",
+                        "s" : "0x338deff1fab83fc87189af6055a2445aafe90ba074ca88a06efd2687c9fbdc18",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d230g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d230g0v0Filler.json
new file mode 100644
index 000000000..63c1a16a0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d230g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d230g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60e66064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x83549190f904f6b5bdd2a5fa461399ba369270ba1cd0cc7ee0112e1799e7b67a",
+                        "s" : "0x1f58d4bc373be4fffb9e766a0202763c90195b180be43133897b787382918a87",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d231g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d231g0v0Filler.json
new file mode 100644
index 000000000..9b4f24b95
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d231g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d231g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60e76064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8886f1ef74ad4d0baa5208d0e13ff655165615c2de2d24c145ff2a1f64f59d22",
+                        "s" : "0x035f2527b1b1077b61b766ff3b7753cf40ba75cef79fe406b3922bd948da26e6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d232g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d232g0v0Filler.json
new file mode 100644
index 000000000..bd5b92597
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d232g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d232g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60e86064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe8fea278a720c4daee014b4c9f1a24fbfd7db1e1b0fd31e805bfe62f7323dec8",
+                        "s" : "0x25c3bb178268fee223be44c6fc61e070b0c0018caa587ada1841e3fdfd497835",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d233g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d233g0v0Filler.json
new file mode 100644
index 000000000..0a86a130e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d233g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d233g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60e96064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0175307b53f0775f81182fec96575bc4db9750a744afdb0ff20a8e4a9c5bd92b",
+                        "s" : "0x22bafdb411ba70526414d164e216b30fc8332f51ae082be6e8b0e405f9dc757c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d234g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d234g0v0Filler.json
new file mode 100644
index 000000000..ff30d98b5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d234g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d234g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ea6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2ff772cf7b534b718428de32a58bff15b2bce69e02accb16a123488d0e553c43",
+                        "s" : "0x499f4a692ea5f5ccc15b86dd120c60d0d66f574c08f9e9f4c64aa516c05d770f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d235g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d235g0v0Filler.json
new file mode 100644
index 000000000..5643d5d25
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d235g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d235g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60eb6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x65b80a4b200953b46f2c83bb4cc035a116585a47ecaa9f0624a8db0e550b162e",
+                        "s" : "0x1ada6cd7aaada36e552ed71e6c7508e9aa840f6310736f35a3dd802611538c62",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d236g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d236g0v0Filler.json
new file mode 100644
index 000000000..291ad47c7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d236g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d236g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ec6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xacaf93bf8fb85f3b717c162af8253a93e6e868d715005a8548517a5b4582cbd4",
+                        "s" : "0x2a486099d62f47532720832f6511a6b65a9e0e9b0d264e0d2252dc572a8d8242",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d237g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d237g0v0Filler.json
new file mode 100644
index 000000000..c477d90a4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d237g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d237g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ed6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc56156246c31cd890a32a249013e48cbadc872b07704753e0a3a9e1eacd8ccef",
+                        "s" : "0x657bdc55e3f8fdcd09bba61f0d34cca6efe3c086296bfe3fd11e6c3e86e547c4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d238g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d238g0v0Filler.json
new file mode 100644
index 000000000..3da8d3cf0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d238g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d238g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ee6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xae562da74d8b2c965bc4ff280075222f1eb949513f1723ddd52530e50e9565a9",
+                        "s" : "0x4a9f2e9db2d42ae78d3805b5c2e8f1a8352983a14d23d94a233ac92397c35808",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d239g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d239g0v0Filler.json
new file mode 100644
index 000000000..6e4372aad
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d239g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d239g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ef6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6d9f61d20980e464ff3c9eb527660006eca6077566bffacb3ff55c3ea6df2534",
+                        "s" : "0x6fe063de3ebe1ceb54da05c4d9c0129634c7bd6db726991e7c2b015dc90a9ee1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d23g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d23g0v0Filler.json
new file mode 100644
index 000000000..3384b81ef
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d23g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d23g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60176064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x852351c1ba50436648a7fb11514fd57b11ba40e8edea16765436099c055babc5",
+                        "s" : "0x658b57765c13de6fe344986c22aff4b050bfbcba3552e9f05ac9a3dbdd9aa097",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d240g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d240g0v0Filler.json
new file mode 100644
index 000000000..593673def
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d240g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d240g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60f06064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf4f851358af76bfacd648eb2a6b931a649674a7a4b13599a741bccc12f6b7a4c",
+                        "s" : "0x433192bbd1f98ceb17567af3e9044d5437fd7ad07542d0b310808c7bfb4e0982",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d241g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d241g0v0Filler.json
new file mode 100644
index 000000000..b2fb745d7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d241g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d241g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60f16064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2dd81e7d1b258469d265c037d2903584311cfd892afab06b3296473d5b9861fd",
+                        "s" : "0x5fdc4532d6ac218056621bee3a09374d52001923572fdad06d49c5d97150698b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d242g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d242g0v0Filler.json
new file mode 100644
index 000000000..08b04b7f3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d242g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d242g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60f26064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf9e04c6fa085325435a59bfa789462612df9ed8c35f5f72c413c898ef69987c6",
+                        "s" : "0x5cf261e433e498e03c73d2df5116e51bc7a04184f0c842b165b4902d3e3dc23f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d243g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d243g0v0Filler.json
new file mode 100644
index 000000000..956e84a16
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d243g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d243g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60f36064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd7076ab6c7400703b1e7d98a65d81695401f24966ae7fed5740da6593397a85d",
+                        "s" : "0x2ffed3ea7d3cb070ad7aa3af5ce90799da6207958b25a2f1748f289619a8e562",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d244g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d244g0v0Filler.json
new file mode 100644
index 000000000..fceee44a4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d244g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d244g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60f46064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x96783270daa4ddb7231a1611d0a80631e493bd20ed1ab0002b357840b387ec0c",
+                        "s" : "0x074a3e4fd5eca886693de2ebe997f8d91cd6839cde95ec3ed8552ece5daba7eb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d245g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d245g0v0Filler.json
new file mode 100644
index 000000000..95e6811f8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d245g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d245g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60f56064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6958cad57c356369eafd7e3f74322e4a7394a546bb9dca971f226f6825956ee2",
+                        "s" : "0x14fec6842b87c5632fd82cb93eb5caf9b0ba63f7155ef5897a4e3c489e232f66",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d246g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d246g0v0Filler.json
new file mode 100644
index 000000000..7c835a118
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d246g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d246g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60f66064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2bac1e0d380440d70196f5a6e2ecbf6bb62f43329b7f154efc3b3964f8f338e4",
+                        "s" : "0x53a595fc99bcffc8b52bb19d8eebb5b5b60e84ed8a3f9a724184f63b8e144b19",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d247g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d247g0v0Filler.json
new file mode 100644
index 000000000..291164b1e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d247g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d247g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60f76064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc6564083caa98a1cc8f76db6f53fb7e8403cbcbf426d771c0d5399947989b798",
+                        "s" : "0x69b0ad9172a0e5e4310ff97fc410d91faa3f9d08fc02d43af512001b343af7e1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d248g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d248g0v0Filler.json
new file mode 100644
index 000000000..806e68e5a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d248g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d248g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60f86064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0eca41ffb7255be4e102e2be165b596198f0b0c80e89985a4a5f0d0b12c5c9df",
+                        "s" : "0x0766c57bc26395a845d867dd7941725f61710fb4a976b64b5b9665cfcf9feee7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d249g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d249g0v0Filler.json
new file mode 100644
index 000000000..dab3dc8ae
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d249g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d249g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60f96064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5a10e2dca5c53fa8edea550b808398c4d201bfbe820615a5b34c2d4f1036e1b1",
+                        "s" : "0x211e91464e9a763e4594f9c61bf858e698084fb6a9cd770e3dd7a49e94b82ac5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d24g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d24g0v0Filler.json
new file mode 100644
index 000000000..1565515f2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d24g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d24g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60186064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x78a38d4c533c75128836ec2166d6a24b93faaed1992dc0d024999eadfdb85fb1",
+                        "s" : "0x1a03c7094f4db890d7c87b751b25a5144feb8682bc46b646ddb45d7b20f95253",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d250g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d250g0v0Filler.json
new file mode 100644
index 000000000..306230d34
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d250g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d250g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60fa6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf21706325ce9429e37999a7038778d44cb89760e5189bc6aae579a62593ffc2f",
+                        "s" : "0x1444d014f7b61c8b738e2c6a0306a5cc675d9b3b16909c301e59cd00efba868a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d251g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d251g0v0Filler.json
new file mode 100644
index 000000000..20a6857b8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d251g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d251g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60fb6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x19c228145a4c336c0e85b65d1a1b7c39a97c2d68ff141290e6367010f830c2c4",
+                        "s" : "0x252ef21cd37853ccdd46a088cc19165abb8b7b01c7c09929ca94a920611cd301",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d252g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d252g0v0Filler.json
new file mode 100644
index 000000000..4b6641258
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d252g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d252g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60fc6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe0dd367d852815a56302fc78999246b0ebed354b14df0a2b53dc11a8f8790872",
+                        "s" : "0x3920d4134ab95ab6d74ae612ea29cef9dfeb84ef38d96ad12590308e24286bdc",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d253g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d253g0v0Filler.json
new file mode 100644
index 000000000..4b8540490
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d253g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d253g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60fd6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1a4355d267409dba6a7cf727c7f2fe15928a0a3a9aa93cbced0b93e1f524ecf4",
+                        "s" : "0x5617c881ed8d4f15ea3440c38b9e14c5c1c9bd301efe23aa6edb4c3367df8687",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d254g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d254g0v0Filler.json
new file mode 100644
index 000000000..74372c528
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d254g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d254g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60fe6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d4ca1611b71569c2c30b1329fcc0449e357ac8f58929bd6cfe326c278543b76",
+                        "s" : "0x2a6dcb0e1f6e3b7263a7f8a69e93f089eadc584e7e7626ce40a8473edfc25644",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d255g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d255g0v0Filler.json
new file mode 100644
index 000000000..41ba5b1e0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d255g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d255g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ff6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4aafe998d2b4de60c8e3377981e495b2192235b70aa4e5d096d481a6b53caa3a",
+                        "s" : "0x3bba83132d8c07192dc896fa6e9413b4f6136bedd69e63f424b0c0675f25fdcf",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d256g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d256g0v0Filler.json
new file mode 100644
index 000000000..6e0c44c1f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d256g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d256g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101006064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9abd566a00415e9f1b8b1d3b06d4faafed158e6cd1b8b5c0bfd4d28ae799d526",
+                        "s" : "0x12abcc8276a8dfb4643aa6f31e565c65b0f73389de4b45981b67577817aa17de",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d257g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d257g0v0Filler.json
new file mode 100644
index 000000000..8bba1042a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d257g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d257g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101016064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe298ee265ecc4453d5ba5b1e0eb4bad2c7549e9443f69fef18c4770cb6cb54e2",
+                        "s" : "0x1f17fb29973097c80d6dfbad49b4f8719b34aae1df68f6342f5ab2a69879fc35",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d258g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d258g0v0Filler.json
new file mode 100644
index 000000000..6ae1124d1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d258g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d258g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101026064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6b7f284f115da0f954f5c22f0cf8822ccc81a195010279a3ab4f6468dc7a9ef5",
+                        "s" : "0x04bb3af4e6a386847b05a675bc23d989141be479c0c0d51c1d73cbeea05def8c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d259g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d259g0v0Filler.json
new file mode 100644
index 000000000..2e0b1823e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d259g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d259g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101036064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2f12fca6980a52609c59c3efb629b969547a8ffab6e1938de7f7246db41a88c2",
+                        "s" : "0x0eac07eac84d7b013fa30db4cfdabe4b51dab326951ae029d466ca19bb1d2bfb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d25g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d25g0v0Filler.json
new file mode 100644
index 000000000..aa2a07dfd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d25g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d25g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60196064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdbd5fab6684883f2bd3c6202aecaa6ceae500fc7db754443e181c2c22475e93c",
+                        "s" : "0x076cd1c17b5715f26f9c0085869ec6ab87f6ce26ba5edd451def6d5eaaf9490a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d260g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d260g0v0Filler.json
new file mode 100644
index 000000000..28b1960b3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d260g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d260g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101046064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x55458e1e0537cbd9e2879804a4f9e468fda2d1847d05d64bbdc9cbe94c2f2935",
+                        "s" : "0x696e54a0b57b7c7d5a0835b26460ed4bd16f341df5893a2ac2ed22045b68119f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d261g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d261g0v0Filler.json
new file mode 100644
index 000000000..364832e8b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d261g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d261g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101056064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf02207fc5338f38ecbb32e754cd3201848543c7eefe60d9d67c5e7d1a0d663dc",
+                        "s" : "0x27ec707d4dfe7513ce4149f00f5b927a22538d4499234a63dcc75aab8f440450",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d262g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d262g0v0Filler.json
new file mode 100644
index 000000000..71f054200
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d262g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d262g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101066064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa9d4a56086ca03161649a34a38b51b3fe0efb5558fe81e10a3ef8934e04a4a17",
+                        "s" : "0x61bcd64957facb98e27d92251d09c12b44a74f034dc88f08255263851c00bea6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d263g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d263g0v0Filler.json
new file mode 100644
index 000000000..10ab65a92
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d263g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d263g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101076064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdc5af116be5f41ede65d536741b573b1dacfbf08fba1b010d76f3cbaad3ef682",
+                        "s" : "0x3c089066b7584089ef885978360c13a5d28ebcbd4aeb15dfcc2e8bff8014e6fa",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d264g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d264g0v0Filler.json
new file mode 100644
index 000000000..f72a7da05
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d264g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d264g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101086064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x261bbc9bdd21d1fcca8f7c1b8c2390fcc8c126fe2f09c55491f575f3bee564b3",
+                        "s" : "0x487a1553c565135258866e3ce4613838f5b06375b6337425682386cf0f85bd15",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d265g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d265g0v0Filler.json
new file mode 100644
index 000000000..0bee61d44
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d265g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d265g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101096064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5d1b2f760a53e82cf5444b695d466e2a43e2dbdf8c5404fc3ca91ed2279d0bb7",
+                        "s" : "0x9e38d32a175c2c81b9997fa99a5ca79bc9e34a56b1f07750ac51035905444c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d266g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d266g0v0Filler.json
new file mode 100644
index 000000000..219e66d13
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d266g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d266g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61010a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa574781653510c06d1d89673af07ef57784842265247f1f0a8ff625928cf58df",
+                        "s" : "0x760ef10e90d03673826dde3be8812e36e1337442b2bf0401e4668d8377d59829",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d267g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d267g0v0Filler.json
new file mode 100644
index 000000000..8d110bba5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d267g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d267g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61010b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe8a626864f1362b5428e32694c9e3a8218d286f3bf96057e2bac2ace2c0e7b61",
+                        "s" : "0x2622aaa896f033618c4b7b4a0fb3f830aef1623383bd05acc111ae87b20a6e87",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d268g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d268g0v0Filler.json
new file mode 100644
index 000000000..645a1e772
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d268g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d268g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61010c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd28e4a19765eb4b5daa94647d1e1ac0bb67dc45033297728570b9f74844e1072",
+                        "s" : "0x4fc79f74ad5a8d5dcbc724a1b2426a701933734dfa826e8cc48dac4a9534abcd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d269g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d269g0v0Filler.json
new file mode 100644
index 000000000..90804a0ba
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d269g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d269g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61010d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4aa88715354551d27d34598c98fddb3d07405a399e76874b069e2e50de67b314",
+                        "s" : "0x3a4938065eb622f4c732311eaf0fb622046090b84467a7dc07b17a131813aad5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d26g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d26g0v0Filler.json
new file mode 100644
index 000000000..d5c2160d9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d26g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d26g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x601a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5dc5da353dc89db4af33a0927fd9bd5e7424e58a29d35bafe3c957fc4f4b4ac4",
+                        "s" : "0x190642dbe378f3a20486a6610d084d391652080e142cb9e667adc4ccb0c0ebcb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d270g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d270g0v0Filler.json
new file mode 100644
index 000000000..7d5cd0577
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d270g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d270g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61010e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x220fa47f9ab77e9285f46c491f174a41cc7bb38fbdbd601d4b6f07e441cc9fcc",
+                        "s" : "0x79c1c51db0f92b5e63da84d6d4fa265b2fdc531eb5e3abe3d17de2185a36e123",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d271g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d271g0v0Filler.json
new file mode 100644
index 000000000..bb81684e0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d271g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d271g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61010f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf6c98198b24963e081dcf0c892f65e03805573557cd74fde3bdd31173bbbdccd",
+                        "s" : "0x7e738a4631df2725dcb43ffcdb79dbe94672c2356384888775aa4c70a112a8e7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d272g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d272g0v0Filler.json
new file mode 100644
index 000000000..cb357bcb8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d272g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d272g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101106064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x71cd508694bb0d54a27d6966c3422f64d5b5b228da0c845b38f2ce3ef1dddfa4",
+                        "s" : "0x2a22f1c5fe5226d0a51822c9a9296a4ea9f805cadbf8043f92522ad4f83bd121",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d273g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d273g0v0Filler.json
new file mode 100644
index 000000000..546f6cda8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d273g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d273g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101116064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf8c3138cc38792bee5c48baa1742fc781207ac77b09d339f2261e578cfa97bb8",
+                        "s" : "0x443c106ed270a379349272e7a521bff9802e891a42e33ab360e11c90a4944b93",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d274g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d274g0v0Filler.json
new file mode 100644
index 000000000..c2c6b8737
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d274g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d274g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101126064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc557cb687078ba2a97408837e317ef2acc691a0e5cb2850a500d98c0eae29adc",
+                        "s" : "0x1187553159bbbfed33e2541eafa654b4f836af376901be64c4c7cde3b489a082",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d275g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d275g0v0Filler.json
new file mode 100644
index 000000000..d8c9a4d31
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d275g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d275g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101136064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb433c3b48fecb30c59c5c43a0442b6252e77bfa29043fa7b9958bdf973059f9f",
+                        "s" : "0x5834b4cce99d317a7efdb3f6d14418a83db62568b8336169d074c5acaa34b63a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d276g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d276g0v0Filler.json
new file mode 100644
index 000000000..07602bdd4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d276g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d276g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101146064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2f99700650523ae02eb3daf44fbfdc975cecf6cbec181a7a32c8597e3e71aca1",
+                        "s" : "0x2d95887ea9644733d5e46994feea218bc48696ade63930c652a9f2b2e2d69be9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d277g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d277g0v0Filler.json
new file mode 100644
index 000000000..c566e2b8e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d277g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d277g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101156064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9697f70b65ffcacc058009152430e3b692b33b2127e69634a5617c78611ca10b",
+                        "s" : "0x087e4fbc5cb7fbdeefbd9379e922574aedf3828623d250334c310b0d21cdaa80",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d278g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d278g0v0Filler.json
new file mode 100644
index 000000000..2e4df9ee3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d278g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d278g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101166064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd574c235219b98cfbceb107f5c7f20751eeb61b458d12754249205e17556dce0",
+                        "s" : "0x41b9bab507d969bd85428c5535131b7698b08df03f59a5c2e9379223fba0561b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d279g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d279g0v0Filler.json
new file mode 100644
index 000000000..6e2d22431
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d279g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d279g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101176064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb255489148e799addce421a3aff199fa772f1d59dcc16d5db0dade485da98e45",
+                        "s" : "0x6747bd59bedadd124653eb7b48adbdce598eabfbac6b95810ffcc10c73d3b2a6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d27g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d27g0v0Filler.json
new file mode 100644
index 000000000..7e06574a6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d27g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d27g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x601b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfeda063d7214f8c47cc9341406324a92b05024e15e99d5715a6219a817b5bac4",
+                        "s" : "0x21d89e69b65b4d8e3bdd293f8d3422432c7f9e33169f67e1f5120d3ce956ebf9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d280g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d280g0v0Filler.json
new file mode 100644
index 000000000..1f5f6f6f7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d280g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d280g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101186064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2d9679dc34d0b2839ff21a337c2173f1ac55edcfafe080ecebfad7241ed056b9",
+                        "s" : "0x741a5ec7f1fdc85c2efe1a47cd71f19590ee1f1e82b1192c739aa73671ff2f98",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d281g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d281g0v0Filler.json
new file mode 100644
index 000000000..9c8ad7881
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d281g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d281g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101196064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa186c6d056518e54fdf1e71d3a0d960f780ee0d7d78dc65e43cda9250a4bde30",
+                        "s" : "0x2a8234ca33f0c6c264c56e0e29e1cca46ea21c405b55c494cb5ea6a739498297",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d282g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d282g0v0Filler.json
new file mode 100644
index 000000000..ff1358025
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d282g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d282g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61011a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x07064314883941863a84b44bc64c3b085efd4020eea719c03086ef6430dc401b",
+                        "s" : "0x1a9a8300589fca9a263f50fe97903ea585f4c80c04d6ace7c93f88795a8e9f2c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d283g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d283g0v0Filler.json
new file mode 100644
index 000000000..931a4c5a8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d283g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d283g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61011b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf7f4b0c57c18695897dfdea6adc515ce0686c1f27c9812d48d63ee63c84ceeeb",
+                        "s" : "0x12265128b718100cacfd1f2496784888608ce239b7e9a763f4f6303be559a54a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d284g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d284g0v0Filler.json
new file mode 100644
index 000000000..efc8f34d6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d284g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d284g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61011c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x428b2bfde753aee82a433707b2cd43d59a64c949d6bc667b1c9a32f5204f0a91",
+                        "s" : "0x21e039045a966bbb98bd8e8e9af91e4ad31fbf2ebbc1019f4416b8ebb81c98c6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d285g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d285g0v0Filler.json
new file mode 100644
index 000000000..fa8550658
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d285g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d285g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61011d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9b2e645605f8c7af9ccbf57a344161c8f21a114bb086a7538bba8d08353de67a",
+                        "s" : "0x2f25ef7838b586e3c9e5261c521820f693ccc1e000f3c2d52e19615de4be445d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d286g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d286g0v0Filler.json
new file mode 100644
index 000000000..f1796a0d7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d286g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d286g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61011e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x28d84ecfc37217924bf0b940ca498f784cc80ca237e611863bca3acf976c7ef0",
+                        "s" : "0x16eaa68043c1e98d0d0c357a0a56e11283798a3fd7839ccebf4ebc763981fbf1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d287g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d287g0v0Filler.json
new file mode 100644
index 000000000..ffad0c172
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d287g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d287g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61011f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x50460d5f4a0fe8408a02d99c7f3ef09f1fb9c8a0fb6604d2601b0cdd4fc38815",
+                        "s" : "0x26f04e9a3c62e5986bc0201cf89654d107882bc81ba7689961a68b3fe63e713a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d288g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d288g0v0Filler.json
new file mode 100644
index 000000000..12ce975b9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d288g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d288g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101206064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf3d256caa6bae94163c99ff864524a0c2370bcf4f56bc407e767b636a1aba584",
+                        "s" : "0x64296e7d9f71a1592de6c527306abe4637769b328d55652fb8b0e451904e1331",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d289g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d289g0v0Filler.json
new file mode 100644
index 000000000..623d01f62
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d289g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d289g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101216064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7a4cb9bf626c674fe092a88f24ecbf9e5f124e26345097520a9cf737b5c0b84f",
+                        "s" : "0x3d21dbc24b710229685dff1ed9e1d61be25669e5922513d6724bd446dfb1fcda",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d28g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d28g0v0Filler.json
new file mode 100644
index 000000000..5d18d843f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d28g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d28g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x601c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7e24e184c96edba202d0ef1e1a29562a9cfadac4379ce31c1438c7f7fbdebc6f",
+                        "s" : "0x6b0f9f8d463bbc721abd93837b34b57007770efb39616b68223598e14e7f0774",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d290g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d290g0v0Filler.json
new file mode 100644
index 000000000..3a3bd3371
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d290g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d290g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101226064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3a1f4874d8d95bd28c77856b143517f5d26834c11b1ba0db7728ad91a49c6cb6",
+                        "s" : "0x43b176452bcc11824bc286963805d3e5c5ee8cb28e063622e253664dca3c46ea",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d291g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d291g0v0Filler.json
new file mode 100644
index 000000000..de44113be
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d291g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d291g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101236064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf55387934fbfdf8c92b546c018b5c67dc9350ac3203946f6b9a09b0648c456c8",
+                        "s" : "0x64b7e3d6c847b196b10a51d831845d5b958ebdb05d13a594b70840d67d66a07b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d292g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d292g0v0Filler.json
new file mode 100644
index 000000000..25c0237bf
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d292g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d292g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101246064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x603996e6a5c4232eec0b55e3419d32244588205f051057a0e7279114e45b9601",
+                        "s" : "0x69f5b9aa969820de54f4da7c450d84ce9b559ace6df6dca32f61fc47ceea5c31",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d293g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d293g0v0Filler.json
new file mode 100644
index 000000000..ce4a62974
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d293g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d293g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101256064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x08463787e63958a263a109a7620acac3f1a8713d6abb76696d22a674f19b5d78",
+                        "s" : "0x316ebb12af6847d9b6897267c521db948a2ce06d88ba3d0292efc18f93ae56c8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d294g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d294g0v0Filler.json
new file mode 100644
index 000000000..e0e472490
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d294g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d294g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101266064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x29424d5b719541382f1c3424090760f9e2fc5776c48aa6208f1302bde1856edf",
+                        "s" : "0x755ba530608f46d0ce32dcb3f9b18ebf012d44e48214b88de436a8ee750c18dd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d295g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d295g0v0Filler.json
new file mode 100644
index 000000000..ff29bd29a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d295g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d295g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101276064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x09725df76220f8572e786120ed75069099639332707c7e500f1a8f120b929c99",
+                        "s" : "0x6fc33bea5e891116758fa5b246579479048a2f1be4a024ed61bc0e75ff2d827a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d296g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d296g0v0Filler.json
new file mode 100644
index 000000000..b70ee9745
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d296g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d296g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101286064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x58dcc762082ba9b3af1b8f979b50460588228fbf800ff5f79f4ec742aeae6e7e",
+                        "s" : "0x1009727cd074417bb01695bd2832b70766367777322c3a78eb02f834b63ca747",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d297g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d297g0v0Filler.json
new file mode 100644
index 000000000..256479883
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d297g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d297g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101296064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x27b8ecb9cdf11037a3a2d944a9892e18e873f24e03c7330f82d5071523a8c21f",
+                        "s" : "0x254408049803320c314337494dd0c168bfacb84c645c9ed5b31a5df63b8c1a12",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d298g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d298g0v0Filler.json
new file mode 100644
index 000000000..b614413bc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d298g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d298g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61012a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x825d4dcaf3c916c38be272e9e505abec886bf2290b99c852af9c81e080886757",
+                        "s" : "0x4c3117fc8741c8ba7228c1a87cafbd350b81f0f15ae98998874e31139be67045",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d299g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d299g0v0Filler.json
new file mode 100644
index 000000000..16b730f9a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d299g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d299g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61012b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb39e2c14aa152b79b2681c402a6772064e303515e479f71370cea8b038a60038",
+                        "s" : "0x33e3ae673ad41e978c5597e65d1b6f582de8483e28517ccdfe07d991b08c5a72",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d29g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d29g0v0Filler.json
new file mode 100644
index 000000000..656f9831c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d29g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d29g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x601d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa3a85bf5a2c08a5d339cfb77fa066e8e3cde183a246efe888a72d112142d8414",
+                        "s" : "0x71738be99072afb664bcf20a6340cab52c3fcbd75578129bf4dd6cfddc37927c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d2g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d2g0v0Filler.json
new file mode 100644
index 000000000..dc6bfeddb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d2g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d2g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60026064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaeaf7a817dba6757785c91aa1c2811147e89aa843e8e7336adfbaeb8a414a9ea",
+                        "s" : "0x605a05b63cbc5edf15e2419ae94bb7bac31c6c8819a49ef395f01654c843644e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d300g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d300g0v0Filler.json
new file mode 100644
index 000000000..fdc83a8be
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d300g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d300g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61012c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x991409828fbc5324bf66b22d80aeeb8eb564fa72c64ca398255b49870ee70782",
+                        "s" : "0x20baa6dcb529b4f7c006d7fd2db1bd6d6620ff456b72b3ccd25c503a09f06980",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d301g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d301g0v0Filler.json
new file mode 100644
index 000000000..f9f30c7a2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d301g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d301g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61012d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1432cca7eb6c78c9f6f1d304ef0db53f4d83d09912f8bb24bd7dc6f7a83b3764",
+                        "s" : "0x30e2b14debb1c8b7867f1f1293dbc2ab53380d758b291a8d808393b65aab27ed",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d302g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d302g0v0Filler.json
new file mode 100644
index 000000000..4951a0c79
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d302g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d302g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61012e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x31521af462dc135405a5e77f312b9c6ca55f94c77350db02d30acd00801c2d77",
+                        "s" : "0x2e14ff47b58dfa5ae2febb16b5cb6b08d943fa04f5f9acfbeba854189891fba2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d303g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d303g0v0Filler.json
new file mode 100644
index 000000000..96ac81e81
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d303g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d303g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61012f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa7a88d705eb93218e8d4c16508388c0ef865d24c51a8d9cce0d5860eae9fa185",
+                        "s" : "0x3163293486f368167241238545dd2a9663b6638f35df2cc381194e31b470ba2a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d304g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d304g0v0Filler.json
new file mode 100644
index 000000000..39de6205b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d304g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d304g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101306064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe2bedf95f6e52341f8f7429ca28e2f76840083672ec5b1b7976fc1e9db57c8b7",
+                        "s" : "0x0f0c475d04841df79286aff3073781e7f862126e4ba6f2ad9f2ad038e3d36ac8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d305g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d305g0v0Filler.json
new file mode 100644
index 000000000..987ffef7e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d305g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d305g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101316064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x19113a5ddc5284d6fa5273fa5e053453264126542a2dffa83e7c052873ed0acb",
+                        "s" : "0x7593c37cf7ede95f69317aadb4962b19030dead8365e85edc27d960a2769250c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d306g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d306g0v0Filler.json
new file mode 100644
index 000000000..608499e1c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d306g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d306g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101326064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x613920c0b50dec827ed9579dcbf02060b5b7cde69d68e8e01ebd72e28713a518",
+                        "s" : "0x1dbeb20a157a2cf893117bc8f7fdb96b810529e9ec053bc1bcf822a32f031c40",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d307g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d307g0v0Filler.json
new file mode 100644
index 000000000..b61773291
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d307g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d307g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101336064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb7185411caa28fa76e27e094e617fa9d4d18ccdbcfa8bae82fd533270d83d302",
+                        "s" : "0x62bc910961af4e3f2eb4575761050665142f3b998f9149fe2ba3bbfb59d31d78",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d308g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d308g0v0Filler.json
new file mode 100644
index 000000000..d1eb0d145
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d308g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d308g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101346064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xedb3b7b77ebad3e78bf7bee09a3318e8ba8f911db30d2f42380e36a3a206ef75",
+                        "s" : "0x128173e762dded423865d40b7de22c2773f374567216731fc9a80228d2c6b973",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d309g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d309g0v0Filler.json
new file mode 100644
index 000000000..ea4672ca4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d309g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d309g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101356064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa353bc893adf14fe9795ab48e80c10480972d91919f87dc37691b7eea47d0dd3",
+                        "s" : "0x6246c74e1c2e81a6af5daa4e8d742ea5b899c61bb3beea3b5f60896eb07daa9c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d30g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d30g0v0Filler.json
new file mode 100644
index 000000000..5c8694f53
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d30g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d30g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x601e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0c0181194f25ed1760b1c5e30dbbf33804ab1e58ad4046da40a3996b32ff7ad1",
+                        "s" : "0x5fb78b091aef457e573f6c5ecab35b060e271f38afd8934dde39f00eb02cc590",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d310g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d310g0v0Filler.json
new file mode 100644
index 000000000..0e22d967c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d310g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d310g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101366064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbb8468d6b6849735db66e71bed1ac2510f8eb647cf5e289bc781a5df634e0198",
+                        "s" : "0x17c3b89b79e76a768eb669f6f221c5b8f21ec660c902f85d9ee144452eeda825",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d311g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d311g0v0Filler.json
new file mode 100644
index 000000000..9744c490f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d311g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d311g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101376064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x87c0d60eddeee416f298e0c5b0973f7d233c60d2fea4ee45f5d93af2c89c2cc1",
+                        "s" : "0x0baac332ff6183bdde2efe9a2390ff81e7fe2c78e3918b7ff2c5fc357f8a4ced",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d312g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d312g0v0Filler.json
new file mode 100644
index 000000000..c7d882f83
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d312g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d312g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101386064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc4bf2a0cb4bff217ba9041d1866c0f3a8d4259730e18cefaa4e2dfffb0fecca",
+                        "s" : "0x08e8ac4bc600ef614e868e9e4a6585d573454785602f34a3ed086799ab8ecc28",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d313g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d313g0v0Filler.json
new file mode 100644
index 000000000..5bdd654b0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d313g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d313g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101396064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5acf385c18c31a872cd52ff790bab96a96501dc678f443cd4d48f454b635db30",
+                        "s" : "0x365ea6ae8998fe0704972f13608e4dcec24230168b21f3356ab97238702642f0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d314g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d314g0v0Filler.json
new file mode 100644
index 000000000..3140aa6a5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d314g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d314g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61013a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3ff060fdabd988b164cf182946c549898d92d7d4b6ece079cb7b48e9be2ff662",
+                        "s" : "0x5819d6ba2e57f2b165acb5295475f0c724bdfddbc7eb8faf9a812398757ffb21",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d315g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d315g0v0Filler.json
new file mode 100644
index 000000000..7d9e17019
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d315g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d315g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61013b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x24ccf9efd0b134a778573962425d254cfb31c8efddfe2ed90f35406b2affae3a",
+                        "s" : "0x2863d01e58fc87d3348531cff4cf28ca72bb245682361e4fd1250ff24bfa90b5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d316g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d316g0v0Filler.json
new file mode 100644
index 000000000..9bd367f67
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d316g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d316g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61013c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdda9134a1b4e9c1defb78176e12cff99921deedfdc83331a40af23b496921aae",
+                        "s" : "0x11f902838ebfe2d5b9bbc56efb7894b7c6f64d727c160c1d63499a6b28f69695",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d317g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d317g0v0Filler.json
new file mode 100644
index 000000000..61b440ba4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d317g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d317g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61013d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x34debf65c9f96add3ad4476ae08a2184f84727a9a1a8cdc89e743110b9ecf110",
+                        "s" : "0x47a0274088e50c85ec9d8b1892ce517ffc74446d0b1c4a24a5e35bbc1d31bdad",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d318g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d318g0v0Filler.json
new file mode 100644
index 000000000..13398d928
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d318g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d318g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61013e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9f12267c1575577e5acce5498eca1359803e31f8bc9d7ab58811afab1e835b96",
+                        "s" : "0x34810ba4135c593d4e8f9a86ccc9824f626777a26cebdbb9b5a447de6d6b1e91",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d319g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d319g0v0Filler.json
new file mode 100644
index 000000000..1a4dd64aa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d319g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d319g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61013f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5b8a108633cf24c2f727150cd8a4810695f996c8f601f312221460e3a4d016bc",
+                        "s" : "0x0aa507177e206c93ed4eed555b9c99f4f0097e501b29fa676d7e12e9878492a2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d31g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d31g0v0Filler.json
new file mode 100644
index 000000000..64751e565
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d31g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d31g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x601f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2b04673f8cbcd70930db28f2383a34866814deb6ddc3dab8849fc8b8dad9f9d8",
+                        "s" : "0x3b9122ef1e2dd4259ee7fd98757f73cdcf5897537b5b13077b545f51604226e4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d320g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d320g0v0Filler.json
new file mode 100644
index 000000000..d22df3223
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d320g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d320g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101406064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x33501de2c386577ae2d9a31a832cd03e9bd827eb8afe6a5d772025364457dd23",
+                        "s" : "0x301fad407f15ca933d9e0c400226b31da1799ebf0983eff2d45b200f7a51bdcb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d321g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d321g0v0Filler.json
new file mode 100644
index 000000000..430b9d299
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d321g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d321g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101416064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x08c52a65883bb99a12024936a53e9b7d56481bd6e96f5471c5604d3a1eb47efb",
+                        "s" : "0x6a471b45bf19f8cfe25bba1aabdf4a026291db033f62d5442411720b14024db8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d322g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d322g0v0Filler.json
new file mode 100644
index 000000000..e6277feef
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d322g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d322g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101426064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfa19cc30521417e2cb743d2e846be61f71eddc24d0fafb901a32c465ff5d8bcc",
+                        "s" : "0x4b0294fe0786f0e2069340e16ec89e006231e6340d8cec5c2f68d5457060a418",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d323g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d323g0v0Filler.json
new file mode 100644
index 000000000..217a64810
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d323g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d323g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101436064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xed4fd93f9ae11d33861acb90baf8030a4dfc060f6e2ee38b6d5ebd55db4b4dce",
+                        "s" : "0x39b103facb75fbc469611c2666ebefec17c09c88697cfbcb6ded6dc984ff806c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d324g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d324g0v0Filler.json
new file mode 100644
index 000000000..5eee56b2c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d324g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d324g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101446064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfbd19eb0e469e81eeeaae8892564c03956cbf88e19b21b164cb11d0a7b0a28a0",
+                        "s" : "0x5fbe13b676ed4518a58c8b412658a415c046184b4051b0b587dd0c54e92a434b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d325g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d325g0v0Filler.json
new file mode 100644
index 000000000..3704f3b13
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d325g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d325g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101456064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9b34d8ba1066a6e668beb91d80725db107e9a618645977db93e58f17c0e95173",
+                        "s" : "0x7ef514f65fc01929ab04c1ba03d3eba6b2d30cfa0fec50cb5e6365d67cc981a3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d326g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d326g0v0Filler.json
new file mode 100644
index 000000000..d14185571
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d326g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d326g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101466064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x43054f142099e0ae09c7006eadb37a3c80bb000b8afcfcfe0077f5b15bf134a1",
+                        "s" : "0x40d6eb5ae63f5567c64f9774f877508c305a3665176c551cc63a03880e2f056c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d327g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d327g0v0Filler.json
new file mode 100644
index 000000000..d16070ac7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d327g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d327g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101476064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x59accd4dd2b0abfab781fda6dbb9350890f82717664f5b0b638f75b91fb0ebab",
+                        "s" : "0x42f3230ec2199d30a464342d50a979af0bae9a8900e5cbe78e6b7c33c8e677c0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d328g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d328g0v0Filler.json
new file mode 100644
index 000000000..a2901ca43
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d328g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d328g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101486064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf07e7bd8ae2b39ce7513c891d7e2eae21e6275b703ea2ded53c3211c2ebc0f33",
+                        "s" : "0x4643c040de2b9c13f4ee57273a48f1de3f47d806226e7d955cafb8e973549387",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d329g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d329g0v0Filler.json
new file mode 100644
index 000000000..1eccf8295
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d329g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d329g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101496064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8e94fc338cea0707c8a5d320334dfa5c5f0ad7f44070e350f6a06279e25c0f6c",
+                        "s" : "0x15672a5883984595b7f57f77a6df74b76024811764841c1f178e479a533da2f5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d32g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d32g0v0Filler.json
new file mode 100644
index 000000000..89636638f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d32g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d32g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60206064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x42d9919a73bf2006edf81da348e14368a7752ea522c796aa1dd0085936b44784",
+                        "s" : "0x6985843eb8f995700b71a40f26722a6d44601bc2a8411d54ea564207cdabebbd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d330g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d330g0v0Filler.json
new file mode 100644
index 000000000..57f049fa3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d330g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d330g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61014a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8ba9ca8d185fda378afdf1ab735d72f73b23cc3cdf96401ba06d3a4c540d2497",
+                        "s" : "0x4d5a0c876ee9865ce18eb6a63a762e4ea9d112273c4b09ec44bd4e82bb4fde91",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d331g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d331g0v0Filler.json
new file mode 100644
index 000000000..7d39bf319
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d331g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d331g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61014b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1e1c9c67490abb517fff622276841ab261fd407b7c03cc3ae6ec9dcb9c34c0f6",
+                        "s" : "0x0d00f9a4f6363bfb5b1980e3d605e320a5b02e0deeaa784871f8544207f31335",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d332g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d332g0v0Filler.json
new file mode 100644
index 000000000..7aea41393
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d332g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d332g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61014c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa43db237be928f83176001078f83a18f66d665869752e0efca50db1065a5774d",
+                        "s" : "0x2d709f5487b1a5580a3c05a34f3bc5645a4b49c9bc58b8e44e2158c223a3dc84",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d333g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d333g0v0Filler.json
new file mode 100644
index 000000000..08a59af9d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d333g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d333g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61014d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x88adccae36945ddc16b8e13d433cb223a98430de4639e8a1e5d395f60ab679dc",
+                        "s" : "0x6ffa18ac969f1ac36a52f94bc8763334c09a03bdc3c181e47ff9979d9104eda8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d334g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d334g0v0Filler.json
new file mode 100644
index 000000000..8bcd1d703
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d334g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d334g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61014e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x632169587c02abaab02cd8d7bf6b41c080b9d5731c2a78ca7e36d4f62986d6e3",
+                        "s" : "0x6ca8ef09b4a7b822d23202aa32c1c1b40cbbba5848e453e8f2db94c86773ef07",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d335g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d335g0v0Filler.json
new file mode 100644
index 000000000..acd9d2aff
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d335g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d335g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61014f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5a8abd4a5ebb15054acbd3bff27b03530d3188d1f617508d351a780d27d347d0",
+                        "s" : "0x1b5e3e38d9338242a4ece88b7a2be496e5fbf5c0ad12913f640386dc088d7d1b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d336g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d336g0v0Filler.json
new file mode 100644
index 000000000..e4e48464e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d336g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d336g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101506064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9ff65d734ae499baf422cb0ee9fa7bdb2617a796c2bca8891bb6be0b21107d60",
+                        "s" : "0x2b4086361c2911174f26c394f3a42606235d98b8603a6a92c4cd4937b1442743",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d337g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d337g0v0Filler.json
new file mode 100644
index 000000000..f14575186
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d337g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d337g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101516064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x64b1d98571bb6f3705d54379e15c348dbf40fcefd7dc7556c27a706009c4c335",
+                        "s" : "0x13dcf2184299ed8c60a325d886bce86dd392b36da8cc042104e43613b75bbacd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d338g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d338g0v0Filler.json
new file mode 100644
index 000000000..3527beaba
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d338g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d338g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101526064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x34ff818847c4f342f0a0cbe4ca10d76682348588bcb3ff2de07fbd69dadcf05c",
+                        "s" : "0x6dcf264a50a2122c9c65e5be55d87f57815f6784cca583d16e9dbdc1eae5e0ae",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d339g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d339g0v0Filler.json
new file mode 100644
index 000000000..26bd0d0e6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d339g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d339g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101536064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5c7b19fed793e4c60a4c6a36912f2028a2de051ca680771d510322313e7209e5",
+                        "s" : "0x77dd75d8e009f74da2d30ac4097284c2d7ad607708575b90538faa7fbedf22ca",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d33g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d33g0v0Filler.json
new file mode 100644
index 000000000..1c671d4b2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d33g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d33g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60216064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd960eb35ac0e06a291167069e70dd9c709f1535afd53318d528f110f19888517",
+                        "s" : "0x1318fd742ac71d251a8f499da0d5b7d51d91bc1014a373e1c03ccdb3b5b42f5c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d340g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d340g0v0Filler.json
new file mode 100644
index 000000000..3642bcf41
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d340g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d340g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101546064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfef00f7de5359a829fd659401422bdd9c46925db71d8f372c55e9f8d6aa17848",
+                        "s" : "0x23dd3eea917836a20859b679aa0072b36b90459bb8ef1aec7d7af2a6a09430eb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d341g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d341g0v0Filler.json
new file mode 100644
index 000000000..e0bf3512f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d341g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d341g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101556064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3ab6e80e61699fcd0158ce41fdcef6bbd6eeac5e980cd0e6f27823fda31aa548",
+                        "s" : "0x7143158cea4ed8997ec53112b3ee049fd117e58ffd4c7731979dbaba34098b76",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d342g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d342g0v0Filler.json
new file mode 100644
index 000000000..07b8eef0f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d342g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d342g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101566064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x94e0ae8670e65c57f585088ad81202388f16f444d8c14bf91d17adaa5079a8fe",
+                        "s" : "0x5a2daa31931e37129d611f3572237ac4bed6d587fc74c6f1f750773c79ca96b0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d343g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d343g0v0Filler.json
new file mode 100644
index 000000000..3022d30cf
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d343g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d343g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101576064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd38eebe75694e9bac835ec9fd6cdc8e71eaa3695d1e02e3ec73a550aab94d103",
+                        "s" : "0x38cd041208dc506ed3ac4762a61783f662aad41f68ad9ff4ab39c1b9a1ec15a6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d344g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d344g0v0Filler.json
new file mode 100644
index 000000000..cc348b878
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d344g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d344g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101586064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5912211e23613163464566541eda17c3c40496c3454ab3d0f1633ed19c71162b",
+                        "s" : "0x4838d5fa18df70f14939955d7c132bdb44d0a73e8fdb462b448435c36e244a82",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d345g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d345g0v0Filler.json
new file mode 100644
index 000000000..6928c5dfb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d345g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d345g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101596064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4df1073bc4565e91b3e8ba6096a8c77c600817d18c30b693b9273ce948ed15",
+                        "s" : "0x0b2f161347a78b35a9dd9a31abc6c5696b9745e5f399b78fcfabeaa55c0c4032",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d346g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d346g0v0Filler.json
new file mode 100644
index 000000000..c3e862c22
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d346g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d346g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61015a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa4f9ee87e8dedda1db10fe0eadb2e045f3d1c0a918ce334ae566f5472b2cf0f4",
+                        "s" : "0x7fbc22d698584ab90944a9bfec1f6087a7cdfb459c1d616dec78f789b75e8bc5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d347g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d347g0v0Filler.json
new file mode 100644
index 000000000..e1050f52a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d347g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d347g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61015b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd65ed6f48894d194ac7637ca7ea81602fa62a60450388e7962fa1a840c9d3cf5",
+                        "s" : "0x747b47367b72d85b88d51b91c6b59f2c5de3d9cac07bff44ee229d86e6436323",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d348g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d348g0v0Filler.json
new file mode 100644
index 000000000..9ee4158cf
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d348g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d348g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61015c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x42e35d4dcfcb60c5273c0fd3769c021c62381b4bedc1ae0e7d118cccc260f9e4",
+                        "s" : "0x5365517a225152b0862c600c4f326c4c13e22c2c65b33606373dd1cff6a9ab3a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d349g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d349g0v0Filler.json
new file mode 100644
index 000000000..41f4b729b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d349g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d349g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61015d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x927e6bc349ecfc16ccd85f99fe3fd30951f1462c396d2d0ae1ffa82c2b290a17",
+                        "s" : "0x43d4046c551270125d343e11b0d418aca3826bae8e6bd68bd4cc7438e3a3278f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d34g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d34g0v0Filler.json
new file mode 100644
index 000000000..86a7a7d84
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d34g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d34g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60226064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbef7af8747a9bd1bffc96f20decc1b4fcca45c7b943fba43e76967696c8a7e68",
+                        "s" : "0x46af2f661dc5c6afea745b9098b082509166691ac3a25ed348d974dd588646bf",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d350g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d350g0v0Filler.json
new file mode 100644
index 000000000..a29653c89
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d350g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d350g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61015e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x66b4ebd1384ef2f2e8201b2de53220b6ed30e27d4d88c4234a66fef99998c797",
+                        "s" : "0x1936d48500eb9a30f268f30f7f5682c3aee96702b2c4544758456aef40d98c4f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d351g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d351g0v0Filler.json
new file mode 100644
index 000000000..8dcbd26e0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d351g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d351g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61015f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x19ab28bbb4820d94adca34e068bdb5690a4e9d245a8dd37721acfd19c27554a1",
+                        "s" : "0x70ad41dc5cf4009de327a7055f947296e84cfed88cebafb7be1d3b783db49979",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d352g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d352g0v0Filler.json
new file mode 100644
index 000000000..36834a9db
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d352g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d352g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101606064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x88209106d5ec547cd1c62abeb72ed2a43b5d0ec6df408cb1706bd96015f8fbd0",
+                        "s" : "0x4d5a8534f24104be062ecdafabb5c05fefc816c6722e563c8d001cdc161f8f56",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d353g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d353g0v0Filler.json
new file mode 100644
index 000000000..0544b7dba
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d353g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d353g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101616064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7fc8edae2a581c424175ea534cff8d55e83232aad1fcbe124f75d001d079b00e",
+                        "s" : "0x7b212ccc3f9f442c1c1635e5d54103302e434f3c98e88fb9ec68bb3155faf2c4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d354g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d354g0v0Filler.json
new file mode 100644
index 000000000..ec39a3873
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d354g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d354g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101626064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x51f38531654806099989b755c88cc246cfe032e81ceffbc0e223caf8c76d3692",
+                        "s" : "0x2b83bf95e75940936b045e7dc26891758d48f578c5a3109cdbfbcc41a8b19e37",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d355g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d355g0v0Filler.json
new file mode 100644
index 000000000..ee10015b0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d355g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d355g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101636064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb61b8799a550868282b57d4730eefb1938ab07ab3b46d7bbafc1f3a255c51b18",
+                        "s" : "0x39953423519bdf087c5cd56d08c66869f766d386f400dcd4754a2c62dab1601c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d356g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d356g0v0Filler.json
new file mode 100644
index 000000000..c7aadf71d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d356g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d356g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101646064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x61199aceb43327cd457d699ad3e95b8c81c31dde5338e88dc1aba25de89ed941",
+                        "s" : "0x5d41c8b038a6bfd2f201da8ef58bd9dcb42623de9385abf54b8fe042a7443c43",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d357g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d357g0v0Filler.json
new file mode 100644
index 000000000..42456979f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d357g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d357g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101656064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x90595b097887d70d5e69b480c744f1adc0eac6143b5b120a8c18d39a0dd8a50e",
+                        "s" : "0x02b2cfdc4862d26eb8fd7eb08ad0f06b52396c8d26542100d7865ac4546267dc",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d358g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d358g0v0Filler.json
new file mode 100644
index 000000000..1d2014114
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d358g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d358g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101666064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x022ba2ef92a972c22fdb818316665ff8649a83696cc9d00bfa4e6ee8de989180",
+                        "s" : "0x15196b36ec7050365ac65a4c050694a11978d1149ecf2ce95183974095676120",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d359g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d359g0v0Filler.json
new file mode 100644
index 000000000..9a588ce81
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d359g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d359g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101676064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdbe598c2e37a214f4f28bed7d9c24e30cf4338006849fdce2d99aa224ac8c93c",
+                        "s" : "0x3c0e895e19502b6618b13d307c38ad56d49b7030bb6947dc81e56d808cae4251",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d35g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d35g0v0Filler.json
new file mode 100644
index 000000000..3df42436a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d35g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d35g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60236064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6d8c98cfdb8b29c793f462047582d42767d011dae26049fdbbce96f5980d0daf",
+                        "s" : "0x74ce92aea99e59e034285710bdbda2a41a2098facc355cb0d02229ff5e789a55",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d360g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d360g0v0Filler.json
new file mode 100644
index 000000000..393f17f14
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d360g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d360g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101686064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3db47166803cccacab4dfcf1912d1214203df12977f4b427de47877052587936",
+                        "s" : "0x7992e3c74a32e8d16f40f88e361960a5346547d9faa0389253af816059f62c74",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d361g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d361g0v0Filler.json
new file mode 100644
index 000000000..9f31b8e78
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d361g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d361g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101696064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5c4e3dfaee9414578803d6096db6bf23a4547aecd6a3795caefa0915e7776781",
+                        "s" : "0x317ee8092c54d4bcc8efccd074f756053306821e738742017abf5fda91a50435",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d362g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d362g0v0Filler.json
new file mode 100644
index 000000000..09e9374e2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d362g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d362g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61016a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xef18295ea237a060c605e1fa1afe49640c21c42a995b22984ba78d4c5e1dd210",
+                        "s" : "0x757ab5b5c24bb51f2a5c5dacc16fa4df25a6ee286f99c4abaf1a55f5cca7c385",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d363g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d363g0v0Filler.json
new file mode 100644
index 000000000..b86059d8b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d363g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d363g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61016b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe54742a96eb3a2dc9dcdae690942e85d16d74fa6ab20b74339ffce5fd7bb8aa7",
+                        "s" : "0x0b7a9bb52a312b8ea9180a49f1d8ede81905c0cee8e1d2475d94ca6cc8af08de",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d364g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d364g0v0Filler.json
new file mode 100644
index 000000000..6cf5d4b9e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d364g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d364g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61016c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0841117dc59a62daee8416751f253b017330d6976d4ac43cbaeec14d3814f40e",
+                        "s" : "0x505f98a8a81b9bd286e1e851ec10e9e9c8818d44c02c1842c8400fca9db2c899",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d365g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d365g0v0Filler.json
new file mode 100644
index 000000000..ad13458df
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d365g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d365g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61016d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5314a0e12bedc95753589595a98d7c0af16d22dfa4e23d30bf5c8d15a71a442f",
+                        "s" : "0x58e82cb8abb6c06e13f3ccb225c2c8a1b1ac75d9fcf8accd3e1dee4036bcdeb7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d366g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d366g0v0Filler.json
new file mode 100644
index 000000000..08cf60d5e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d366g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d366g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61016e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6f972294e3e5ade6094a2d26ec967351ae7963468ddfc65dd4142eb56dbfc183",
+                        "s" : "0x332ff527800e0e69ac176258ed8cba5e5810e5d9d60d0e8c59ca83c6e24b27c3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d367g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d367g0v0Filler.json
new file mode 100644
index 000000000..a30edbed9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d367g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d367g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61016f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf5779199eb816fceb96e17ed4eaa9871bee464f1309927f50478b03cbd4b23ca",
+                        "s" : "0x7bc3213e7700b67843c0384e0c1c7f9c2089237c500e01e86e4af1f1256c399d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d368g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d368g0v0Filler.json
new file mode 100644
index 000000000..b47607615
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d368g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d368g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101706064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6cb19d21af745d2d9a498b3279fd6d4ced231a413c561bcff528b452fb3817d8",
+                        "s" : "0x6414251019bc6eb687b023702968f2647956bff4a11f0d6661a8ca303ac11cf1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d369g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d369g0v0Filler.json
new file mode 100644
index 000000000..6a9f9f37a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d369g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d369g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101716064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcf723723bad169697abc35bf8f9561597d8a69179aff7fd067f67c15f5551f2e",
+                        "s" : "0x733327c81c13c2a0a89987007cd52ab36e6cc216fd5f42785c674c2aa01ee368",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d36g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d36g0v0Filler.json
new file mode 100644
index 000000000..54c6d1eff
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d36g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d36g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60246064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf83ea5889003ee2dcc78937d230ef050346f89f71960635ff782fa6f525e9b5f",
+                        "s" : "0x47d6cdd271a780697d76a56362ca563ae16db83332379ea125508706cfa9cb4c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d370g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d370g0v0Filler.json
new file mode 100644
index 000000000..b72ad7921
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d370g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d370g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101726064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x32e3005003f276ebaee9114b09ed5fbb15521796624291c88e545744310fe2ef",
+                        "s" : "0x4e21d49997b7d87454ec9defaa20ea5d1ad0efc29a2e9a9ced79e5ee0c405e20",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d371g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d371g0v0Filler.json
new file mode 100644
index 000000000..8fab75142
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d371g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d371g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101736064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x31beab9bbfbfe76661018cffb6f0f2f1b123135eceb8ef3a20ecc9a3a919de9b",
+                        "s" : "0x7f030de4519ccc3ead972eb84a433d05343889825e3e77b15e559903d7957f00",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d372g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d372g0v0Filler.json
new file mode 100644
index 000000000..bb2cac281
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d372g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d372g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101746064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x72e722de829bae7575f0f0258e2e02b034aefc9a0c9ce09af7ac9c18692d6a32",
+                        "s" : "0x25881e17b6189141b9104426153ecac637ea530d60c1c8d78a472843947083df",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d373g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d373g0v0Filler.json
new file mode 100644
index 000000000..9dc32443a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d373g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d373g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101756064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x85dbfbf8b908802845c6300fe31f092baf9457958d666b88f5949d5b06c761a5",
+                        "s" : "0x6a9e6e5c7c9cc9b99b9e853f745a4654fc9e39a235bade0a4dcc0fa6ce16f8f5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d374g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d374g0v0Filler.json
new file mode 100644
index 000000000..a743e2bf0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d374g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d374g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101766064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2f3339bea976befa8dbaabdc00882ab989851cbb15fe678a84bdec19bd39e490",
+                        "s" : "0x2c3cb2277a71cf92255e4a1f28c5c7fffee9d4963d05f699440f40abda3f6bcb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d375g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d375g0v0Filler.json
new file mode 100644
index 000000000..7b71afb14
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d375g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d375g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101776064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe5be189bd3256c902130f27c5be9c81d8a4e5c92558d3866782061edbbcee082",
+                        "s" : "0x09bca38b266230c6a57027ac4c0cd49c569f3a141d113f816c16b9769bdc92d9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d376g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d376g0v0Filler.json
new file mode 100644
index 000000000..2c08999dc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d376g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d376g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101786064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x66a4aff6cdfc5275b64a3dd2e308f13346a506271b9976d9100ca5564e84da5e",
+                        "s" : "0x32798a2cf81abcb85d83723ea84742240b2e18cdf49d734dd07f4eb099a18753",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d377g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d377g0v0Filler.json
new file mode 100644
index 000000000..1cbff1678
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d377g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d377g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101796064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa50e66966e61e7293550754ac83414dd37b0f99e221b0eee3dcd818803423652",
+                        "s" : "0x5454be27881e4852147b78ad68828e7f6b83d765e0db9c6c156c17fee4e1978d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d378g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d378g0v0Filler.json
new file mode 100644
index 000000000..c3f93998d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d378g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d378g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61017a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x84fb693b3eb3911b1c4bcd982828797dbba70231d46f148d4aa6c3af1d75059c",
+                        "s" : "0x20e869040d925ad39a4fb137a465bfff0babaf05bc23f0c6355a5d2466dc6fce",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d379g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d379g0v0Filler.json
new file mode 100644
index 000000000..c1098518e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d379g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d379g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61017b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf24e8aa50fc9057740c2bb207c112ffd28fa11b966f5a4bf931dceeed6af21b7",
+                        "s" : "0x1a61fbbd3b419072b81f9fe523f21b7a69ba2bdbbb96eb9d9c5b1de031ae0c84",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d37g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d37g0v0Filler.json
new file mode 100644
index 000000000..f80b483e4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d37g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d37g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60256064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd37d89622658df097055f97a2dca26bf78a8aed7d757f3f589864bddd8dbbf47",
+                        "s" : "0x36655c700abeea86fcac01683f9174f3614b6c6b431d05b56f7c54b0b62baec0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d380g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d380g0v0Filler.json
new file mode 100644
index 000000000..7b703b0b0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d380g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d380g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61017c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x69e2faa0010a4a7472d9cce13241ad359b2ef5f75128f9839bcc13e52dc86e5e",
+                        "s" : "0x7f5758414121a1d627c7169feae77d60ecc2c4d0b1002a598fc0815da638cb81",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d381g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d381g0v0Filler.json
new file mode 100644
index 000000000..3b38466e2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d381g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d381g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61017d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7cf9be6782658b884fe71d94aa98c368837c2aff531e50d6d0de2c45be450b2a",
+                        "s" : "0x6554ca105c91e4b69d8f505e385da613ea15535852cb9427fd2b337cca62b043",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d382g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d382g0v0Filler.json
new file mode 100644
index 000000000..0399c8454
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d382g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d382g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61017e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x83b49fc12c427581d1fc31425b00e28b3c53c5c42324a2b3c5c0bdc289199389",
+                        "s" : "0x5bad35862812727b93c8d2f70469a2f6b29b9a3c48b0b83e88194ac9f07c2831",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d383g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d383g0v0Filler.json
new file mode 100644
index 000000000..b917c8504
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d383g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d383g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61017f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x67fb7557e8c1a4656c74895f26843914a63bdcf4989e17db46a6fcede5fc6d2d",
+                        "s" : "0x62ee1097ee8683e5fecdf97cc48bf1844e5386af4c0e124a4a77311fc424aecc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d384g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d384g0v0Filler.json
new file mode 100644
index 000000000..88f5ae28b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d384g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d384g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101806064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe023e838a6452a334cc5a1d2b0ea00dcc25fe1ac6ddc3b2b0ff04d644248a091",
+                        "s" : "0x5a52155065daafb4db9ee4d469176fb1f39e278135a3738e074745968be0d78a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d385g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d385g0v0Filler.json
new file mode 100644
index 000000000..4420d0a18
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d385g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d385g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101816064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x144ec59fce8deec3740cf5ac02c29641afab261fe4c6da7fe95289656dee57eb",
+                        "s" : "0x6228fdb8732f5c6f8dd2bebc78e983678c62a95d8a6aec1abb9c45477066c894",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d386g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d386g0v0Filler.json
new file mode 100644
index 000000000..07489db30
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d386g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d386g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101826064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x38dd0312a0b3c79769b0d8e6922323b5cc0b6e1e538fbcc5fc223d92107b2956",
+                        "s" : "0x596cc2b362ced1d68fd1f42cf39e9a15a3f3d0a1d1943ff5afebebd37d4c45bc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d387g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d387g0v0Filler.json
new file mode 100644
index 000000000..e0c739a0e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d387g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d387g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101836064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0ba4bf4fe09913862569badae7c67603948b11e5744634a38969921029bfd4bf",
+                        "s" : "0x2cd9aac910a2867d63d8225ef071dfe8a37a6cc56caafa112e29cb0399208a91",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d388g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d388g0v0Filler.json
new file mode 100644
index 000000000..1e288ed36
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d388g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d388g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101846064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3818fe3c1a6394e985d2dddb30fc9a5cbe96c15788b910fe086975fd0c55ea29",
+                        "s" : "0x162a9a6a718289b2063a3b520570d981743707b3a543b8d822f96f1df32e3c4b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d389g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d389g0v0Filler.json
new file mode 100644
index 000000000..2e0e30605
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d389g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d389g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101856064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeab87b54383ba2423795412d39304aa1d6abe7f50330574e9b104d8d821c4150",
+                        "s" : "0x52160bfc5702309a14d3fbaa987e8a04306f46729c88e01c6cbf1d17832a5473",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d38g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d38g0v0Filler.json
new file mode 100644
index 000000000..1fa37dd2c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d38g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d38g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60266064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x027e944cf4bb1cbb77a8caea34f703b37138f7501fae1b1ce73b83ab44cde713",
+                        "s" : "0x52ec1b34c34d00bfc3af8944b62c0ebe76817814a3a03b87bccd63240da44673",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d390g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d390g0v0Filler.json
new file mode 100644
index 000000000..1f71f6ac8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d390g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d390g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101866064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9dcf8251411e68cb3d52354cf877f4be58dc44178e7436e3e23595dd3edc200a",
+                        "s" : "0x4f817f1ebf29e6ad01d21129ddfd6d7080406c59dc382b6b0ccb89386ee62909",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d391g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d391g0v0Filler.json
new file mode 100644
index 000000000..5d64a8d5a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d391g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d391g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101876064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x42148aa363b635a066dbf172daa4eb3ac28d62ce4b76eb0c9b27b13b79787384",
+                        "s" : "0x4f1714d3685b9fc4c89023bea11a8bbe89ada61ae3c8b52de48d86faf3d5afc7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d392g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d392g0v0Filler.json
new file mode 100644
index 000000000..24ed6d72d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d392g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d392g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101886064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1e7393c77085c5dc549fd8d078fd9a41b36737bfece7d3014597b9223453ebbe",
+                        "s" : "0x15416898575a4b4e1a70fe9d1dd4b9357bab180fd34f769f5cab96692d88e2b5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d393g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d393g0v0Filler.json
new file mode 100644
index 000000000..2a0a03af7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d393g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d393g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101896064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x177cebbbaa3488298ad7fdc0fe334a1a84d3dfeb7e25bf9f54399b25d04d6683",
+                        "s" : "0x488719b990221d5a637756b13ca1f65bb4a5d84f21358f407ff9fbd550cbbe76",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d394g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d394g0v0Filler.json
new file mode 100644
index 000000000..52dcdfbfa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d394g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d394g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61018a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1cb43289f9ca1633e57c72913091af2121ac1e965390df0c3a7b47b71802d3f1",
+                        "s" : "0x280668a7b944f0f16b1a2aa2046d0ee19fd25084f891bd30ee88fb8f9f6b7bbe",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d395g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d395g0v0Filler.json
new file mode 100644
index 000000000..86a9f6091
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d395g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d395g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61018b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2f7a93f7c1f31e77eb02443377041e89e445635a6877e4a27bef0258f919852e",
+                        "s" : "0x7362f7c3c26830a65ae4ab8ffbc6c327d87bbf6c9eb53a27b9fa30f74c45947a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d396g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d396g0v0Filler.json
new file mode 100644
index 000000000..79d28fc64
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d396g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d396g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61018c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9cb4d0c96a09a7e2e3811c6f65f43f418b4ee13ce9028e16219aad7b7345f830",
+                        "s" : "0x79b4c65bda84afe493bce51bcb65c28cada62e604ee45993fc34f4cf802fca22",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d397g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d397g0v0Filler.json
new file mode 100644
index 000000000..d1ccddb46
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d397g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d397g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61018d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb9548059577ff98e05750144b7f3c61f6fd7d7e8f0278ffd30a961d93bbb80ab",
+                        "s" : "0x624faba5672b4750eda93ce02af736dd59eafc803eb4edc3fc36b7efcd495f39",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d398g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d398g0v0Filler.json
new file mode 100644
index 000000000..591c94a97
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d398g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d398g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61018e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2152b47fb51caf27a18d01b7d1ff9bc95606c18ae0d2532d2598d7f243d88378",
+                        "s" : "0x4ecb3b3d0d2a5bd7614def82cb51ae456bd4a04ad806edcfa13e33754efd9b27",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d399g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d399g0v0Filler.json
new file mode 100644
index 000000000..196c69765
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d399g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d399g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61018f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2f025ae840b93319b92e9cd5f396615b95f346eb131d2ee3563bc31e2100b5",
+                        "s" : "0x224d36b99f70fff75790d474c812c2672f1fa1deda74516efc3ea69fdaabaeea",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d39g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d39g0v0Filler.json
new file mode 100644
index 000000000..dde73f4a8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d39g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d39g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60276064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5e9fe075bc8d99787a037dc5db901b343a0505331e3998bf6d81852941bc92ef",
+                        "s" : "0x0ab3fc93635683337d6f3a7f3934923da7a37bca15c4c89f372e23776ad404c2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d3g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d3g0v0Filler.json
new file mode 100644
index 000000000..da0ce4f21
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d3g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d3g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60036064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2daf19760d1e49924acddbd1f4c49dba8852a1f1dcbaaffd0574294e8fc8aebf",
+                        "s" : "0x369e71872e8563752223a31fc6fe934fe43f53dbe7672bfa81b59b8ba8b95227",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d400g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d400g0v0Filler.json
new file mode 100644
index 000000000..7d51f05f3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d400g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d400g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101906064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x99f060ec13b70f6c0c5018bf77e41f07f44a87c3a2584ba8567a755a1c7d5825",
+                        "s" : "0x460e8e7748aa5b2e6f9fdf607f2fc126d55b0bf6be1b2b402c10925fc313d40f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d401g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d401g0v0Filler.json
new file mode 100644
index 000000000..21c6b40f0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d401g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d401g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101916064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2fa895942f69bf22a3d5211dc8307985c29b853adad12947e16aa2f84a19dc4f",
+                        "s" : "0x44aff45b392679481c55d12dbceba14c44b284be3d2d430c07e6ea937fe3ff26",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d402g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d402g0v0Filler.json
new file mode 100644
index 000000000..3bd237933
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d402g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d402g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101926064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfa33ea1a60fbdc989888e415800d2f532fca1b5d1528c9f0c0ea8f155b24e6af",
+                        "s" : "0x2dcff24b1b8461c084fa4a49d96116cc99df43e3318072dd64d5b3426a2ca36c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d403g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d403g0v0Filler.json
new file mode 100644
index 000000000..1ee913f86
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d403g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d403g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101936064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x71ce3db3d898b02e2570e3a3ee06b77d15deff0dbb6704f73f498cafedcdf682",
+                        "s" : "0x3c9c74919dee3afb7bda747477ef9d780e6b3ff092be676f056a7340e2226493",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d404g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d404g0v0Filler.json
new file mode 100644
index 000000000..a4b2780ed
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d404g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d404g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101946064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x57f58caf6661895c21150674e061be701ab0d2eca7fd43077474e54c98094635",
+                        "s" : "0x4cd8f5ce298917ff5f2cfec5f9731a9e12a3ccce305d4338204e82db575271f0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d405g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d405g0v0Filler.json
new file mode 100644
index 000000000..e8681be6f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d405g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d405g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101956064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc90085d14e3f96ed9cdbd95833b59cba99b4892b7abe1508056fdaab67185604",
+                        "s" : "0x5c42e04b7e870df8786f08be7651b3d3c347c2a319d8db0d483398908c13610b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d406g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d406g0v0Filler.json
new file mode 100644
index 000000000..80ae8cc51
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d406g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d406g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101966064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4bf5022271316e5515de26d47fbe127d0bd8c5d32225b1df6e524d246fb81909",
+                        "s" : "0x21df5ed0c2954e92c0771d34b548cf7c5d5ef36735770b3d0e70bf9db97c32b5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d407g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d407g0v0Filler.json
new file mode 100644
index 000000000..4aec77020
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d407g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d407g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101976064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc56540e60d9bfa33a8c8d4270cd40b12238f9d972a2f553d964073ce3498e842",
+                        "s" : "0x6d70b52530ea170c218c21f5d8710a358a4a8d03ab49dff7f14ba49856032d18",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d408g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d408g0v0Filler.json
new file mode 100644
index 000000000..498b0e03b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d408g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d408g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101986064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5cac4c73b66d2a6f81b7010e4d9550177c6bde47ee464733a7c810b184356397",
+                        "s" : "0x65efee5c5cc0cc116bf49e5b1b8b29be16262b51f852719e616bf993aac436ae",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d409g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d409g0v0Filler.json
new file mode 100644
index 000000000..99d008805
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d409g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d409g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101996064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5a8ae1393d57e5d94978b444e29d27f284366b55b814873463ccc075af070127",
+                        "s" : "0x227fd739790dd4c6125d00a64c3961fc1987b41aa7cc9b22132faa28cbe6909c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d40g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d40g0v0Filler.json
new file mode 100644
index 000000000..a198450e2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d40g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d40g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60286064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9ba07530bc6ea45fa6d802270cb34f374be7f94ee2d4bda8f301d23f0e7a21ba",
+                        "s" : "0x15c7dcc90d142d522ff2727196504b8a8af5144fe2d2882c13a307f9846fe22b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d410g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d410g0v0Filler.json
new file mode 100644
index 000000000..659e7918a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d410g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d410g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61019a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1021846e96561c962ab24a23ea2c3a50fb574390aebd6bd68f7e2cf110a2a953",
+                        "s" : "0x7e7e4c6532bc8be57e96016b3d4cdb4b6e5c43b17baf307ed76a7d318b3c5ae5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d411g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d411g0v0Filler.json
new file mode 100644
index 000000000..b96a28ab2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d411g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d411g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61019b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9ab18368ee194077d2954fce8ce1b5bdcecf0c8cb9f216602945b7a485510f3e",
+                        "s" : "0x348b4bc08679fd04cfc5394c8318688d0f226f424b413f23270bf2090c0d4acd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d412g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d412g0v0Filler.json
new file mode 100644
index 000000000..e2d57161e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d412g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d412g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61019c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x74d36784eef4ca65f9c29abb58afb9d7e9ed5c448f80581c676cebdc759ecc09",
+                        "s" : "0x5eb346e53a62ecdeb642cb60fde4aeb704427e12322e0797f7417c274b4e4377",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d413g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d413g0v0Filler.json
new file mode 100644
index 000000000..bec591b4d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d413g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d413g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61019d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x945cf682000501a368730d7a1990e6125ba16517861a62bfdbc56ddae902dea6",
+                        "s" : "0x6c4ebb2e084079ab472d061d1af8f53417a8595468d24c7ca170b5585a79e30e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d414g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d414g0v0Filler.json
new file mode 100644
index 000000000..500b3df5f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d414g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d414g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61019e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3103230613abb9a9a66d8548104bec4df6f543d93a2d8157212552d7fb0555cb",
+                        "s" : "0x2ce8d1a1e93819250ccf084316b7e8cf5d722648d120175528db501a61758e02",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d415g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d415g0v0Filler.json
new file mode 100644
index 000000000..0e951d65b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d415g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d415g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61019f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe1b94e9b40c46de498314c751810ce9105ca3dd1def182f3a35e2e32d7faa531",
+                        "s" : "0x2c21018944113f0c4dd9044b45198431cb5c078b6a86dd04b9b82c58f74a5125",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d416g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d416g0v0Filler.json
new file mode 100644
index 000000000..ac432ddae
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d416g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d416g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101a06064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb94f9e253f5954edaae9a6feed1015b7a0f093c8bf5af7f052af0dff096fc45a",
+                        "s" : "0x5a1460d122c1f316d59e6f27aa73763203625b5be4387356ecbf9467d4b3b3ab",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d417g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d417g0v0Filler.json
new file mode 100644
index 000000000..b6e3a19aa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d417g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d417g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101a16064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4615d9148a39803d64a8cabd0ad5626d2ff1cf9f5a659009aa29eb589121f094",
+                        "s" : "0x49809d6e007a9612f00cf512d9dcc10f6f5be8ffaccf2307217d576beeabad5e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d418g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d418g0v0Filler.json
new file mode 100644
index 000000000..caaefc15f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d418g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d418g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101a26064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcd6f9e3bde2f1a674706f950b729ccc25dd42cfe110041f53239b43d636fe733",
+                        "s" : "0x611b2f940c97b72b7f7c8995365c6fc94a77462ce964bf076a6d2ff5f97e3b21",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d419g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d419g0v0Filler.json
new file mode 100644
index 000000000..72d4de41c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d419g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d419g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101a36064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfa43b5baf0b25c82823d9950160abd3a732f3ca00121b7aac0b8bb3dc5a8853c",
+                        "s" : "0x1e2740f0ee4fec00a6936ded134fefda343e083354b06fc7574428b764c22db9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d41g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d41g0v0Filler.json
new file mode 100644
index 000000000..314966300
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d41g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d41g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60296064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x65bcc9c1dd1890858a40762754e37a5881537bfc2d55071a0128bd902f17717f",
+                        "s" : "0x43c6a4424c92097aedd24755546ac03e78423acc5f87d1cc8e0cd482948b7586",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d420g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d420g0v0Filler.json
new file mode 100644
index 000000000..ba1db3bd2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d420g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d420g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101a46064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe69a95b88e0d78f64dfd512668dde9b76c1405991e827a17711c378999f252eb",
+                        "s" : "0x734b6b65e7e820a159fdebf77074a0f6a30bb048874180d0f3d4d36e1e6cd6fc",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d421g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d421g0v0Filler.json
new file mode 100644
index 000000000..19bce7e44
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d421g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d421g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101a56064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0977c3c75c27142f587470136cbb8d947c3c3177338a05747a457c81afc98d9f",
+                        "s" : "0x65394c1b4cfd48253e8492fb44bffe9afcec0f7be151529ce4cfd65022939c4a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d422g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d422g0v0Filler.json
new file mode 100644
index 000000000..ac3f799f5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d422g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d422g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101a66064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd7552ed9e4f1e9c091bd358ca6a962bb3e6e59e0331bc2016f9ba9898f7f97d9",
+                        "s" : "0x6e6057d9da27177db2a0999ed4fafbcc7f2be48a3ddda75695d9601f591530ec",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d423g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d423g0v0Filler.json
new file mode 100644
index 000000000..329c13e44
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d423g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d423g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101a76064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x33f538de89374b9f49205c6ef2e48b8540d24a49975a4a17c75c179468f9b41f",
+                        "s" : "0xa08e491544a38d3f8f666e8b3e11a6470e2fd3a096ea41a0eb67a88c92f194",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d424g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d424g0v0Filler.json
new file mode 100644
index 000000000..41cb3d298
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d424g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d424g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101a86064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdc020275b0f191c554cdd511b1957e135562e3b0e178ae114897907980793b72",
+                        "s" : "0x68f0a87e8e64892168797dc6eb26b55f86bd4bf8b50f54a16bbe6227b3cd9814",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d425g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d425g0v0Filler.json
new file mode 100644
index 000000000..5f09f9bb7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d425g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d425g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101a96064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9d6ad505ddf4fbcfcb55d00925afb77431951d79f0447df3d93f854c840c71c3",
+                        "s" : "0x7d10f4c65f075afdb5108586a188dd7eca780d574b615ed5cdd769ea84cb69b1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d426g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d426g0v0Filler.json
new file mode 100644
index 000000000..913325250
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d426g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d426g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101aa6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3c645f65af0b5dc42292b92f43e7ea5436b3c103875f6d93e2ef5d2f5265e6d5",
+                        "s" : "0x5cffed82f13cf1ce036bba975a83b918debaddf828d253b6e54744f80a42c6e4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d427g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d427g0v0Filler.json
new file mode 100644
index 000000000..2ee3d4e33
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d427g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d427g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ab6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3f59540193ba6a3e40a8ce480cd334681eec9c492a0dc6487275ce1d575f293c",
+                        "s" : "0x4ee73049fd55b05dc125716a9414b2baddd82aaf073fe3d07020f9d4701225b2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d428g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d428g0v0Filler.json
new file mode 100644
index 000000000..541df7510
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d428g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d428g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ac6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc9626a179c02bc7b1c49e3dfb4dd4751d7aaf7908578181a45a2f5b0c83158f2",
+                        "s" : "0x2c5d666b3db0b0f6952342590a954ffe76e5adcd5fb39fbfc02b4af567115e79",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d429g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d429g0v0Filler.json
new file mode 100644
index 000000000..31d4b4b80
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d429g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d429g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ad6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc240291385eb1ab6c751997a88d8e7d80768d9b252cd0d11dd81db7814d63d89",
+                        "s" : "0x4b58c0a7fa0a524638253089bd0802f45ea1ea1430f16b4d861bf363f28eb3c3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d42g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d42g0v0Filler.json
new file mode 100644
index 000000000..0f9a61352
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d42g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d42g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x602a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3d85d3e7e87a5ed495937641af8c10d446174df431ebc0addb5a49c88471a577",
+                        "s" : "0x5eed2f3831b12c87d05cb8acda2714d8da1b9f855d896095a6485cc89d958356",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d430g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d430g0v0Filler.json
new file mode 100644
index 000000000..5862b69a6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d430g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d430g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ae6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8c0a1bb6ab83b08e6ceb048285309e19f39913f5b188c7c3bbf21de302226363",
+                        "s" : "0x3894701a62369a56b48d951df9d7f1992658eea45afad89f76e6983901a2dbce",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d431g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d431g0v0Filler.json
new file mode 100644
index 000000000..6afd47c60
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d431g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d431g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101af6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x58c19046e33f2b47197aa1b0f36506b6d34849443af77bb28247fc28517bfaa8",
+                        "s" : "0x204917276ee9f4d092d78930fc1de0d051c7958889f1f0cd4e576717fdcda52f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d432g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d432g0v0Filler.json
new file mode 100644
index 000000000..83e9c3da4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d432g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d432g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101b06064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x365780870c551deec6bfd423c02c2f1f102be78c624100b55d8d749adafc9182",
+                        "s" : "0x4a4f77c0bfc1bf44137561099a0d956ebd5c90f7b56bbf9231a40e22edd1ad19",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d433g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d433g0v0Filler.json
new file mode 100644
index 000000000..ad8a8a93b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d433g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d433g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101b16064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xff5bae0a6221dde247fe0fa356d54f7ceb55590a3a7b1eeabf97c42bc226d09a",
+                        "s" : "0x207e07577b4af19edea51bb229560a9786b6f361d6861dfd75db8fa9b685e79a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d434g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d434g0v0Filler.json
new file mode 100644
index 000000000..af8bf2eba
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d434g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d434g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101b26064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2bf527d3e5625ae42a22d8fc86d33256f6c4c3dbcff63407806ed137517323cd",
+                        "s" : "0x702f9134dc9f3e4325ee8fdab9a32d32a13852bcead9676524043a5b23791c81",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d435g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d435g0v0Filler.json
new file mode 100644
index 000000000..1378575c3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d435g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d435g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101b36064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb12155a5feace833163c997ca46a6b3603560e0058238b49781171169547428f",
+                        "s" : "0x53f1ec4a3bb515eeea38ae6d30f8208b0a60f711952e32c292d00ea9c6223bd1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d436g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d436g0v0Filler.json
new file mode 100644
index 000000000..e047f9fdb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d436g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d436g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101b46064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x768761938203d86a4acafff886b0a288309949e042b5c258ac8a8ae287fa4715",
+                        "s" : "0x3ee7edae1b0d302b1bb2d26dd60b723aec474288611a03efe7c8df766c27282a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d437g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d437g0v0Filler.json
new file mode 100644
index 000000000..6dcaf7e62
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d437g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d437g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101b56064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2e0314aefbbf1531912ec94ae96afd99185fd1b35e4378e9a28e1fb0ea7f5ab8",
+                        "s" : "0x1efcb600a963e5530552534507fd4aa452804597ca1d8b780c3addb9ec97ea29",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d438g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d438g0v0Filler.json
new file mode 100644
index 000000000..dda8a6436
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d438g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d438g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101b66064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x85a327bda212f271e184cdfce42295547dd5c9d888c5983eecf7af2df933aa8f",
+                        "s" : "0x08f021845a163771cfd206e01b0eab07ac2580137b500cc83f177d0f0859d61d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d439g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d439g0v0Filler.json
new file mode 100644
index 000000000..81986c8d1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d439g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d439g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101b76064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8687037a77bf103ac3e16e52d75e5d4a77864009a3e702ca1792af5b9c7305d7",
+                        "s" : "0x07960a5909e92700086bf591d951d0333196e9616219fed3461a6ffb52301153",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d43g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d43g0v0Filler.json
new file mode 100644
index 000000000..31e14c5c7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d43g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d43g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x602b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe6fb7ebfd6608d06789c87ca74b5e9450abc623cba68e301b5d5d35979867d22",
+                        "s" : "0x01ef568357e5f9c4ed21f9ef94d868f3a68fb6e3b97eef7d73f74b7581814a51",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d440g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d440g0v0Filler.json
new file mode 100644
index 000000000..c22a54c51
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d440g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d440g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101b86064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x966b79b64c80ef0c9786ca6d56bbe39a352f0f46b743525b05303a8cd44e61a6",
+                        "s" : "0x132dac48e8f81d7c7b11ed81ec126435a7fd5ab6f1266c4ee227b9bf8f27c860",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d441g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d441g0v0Filler.json
new file mode 100644
index 000000000..fe93788d4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d441g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d441g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101b96064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaf4bb2693d5ddb61d09a27fdc62e334ad72c533d064329f6ce9491b9db7cb447",
+                        "s" : "0x0abe28458787dac57be78f80d1e4a2e31f675dbd94bff8fd5f5c8fb6445d802b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d442g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d442g0v0Filler.json
new file mode 100644
index 000000000..73c23b002
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d442g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d442g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ba6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x97eb372ed615df69d7018311bb84919c78d52f227079b821461b47fe78d3b2c9",
+                        "s" : "0x136247c91ac3b9a09110a5ff90c2f12e684dad06fff45d9277820825475f1070",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d443g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d443g0v0Filler.json
new file mode 100644
index 000000000..d70e132cc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d443g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d443g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101bb6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb7651b033341aaf0150dc66467fe2225d1649e3888f2e0cf0ed01631ab4ffca7",
+                        "s" : "0x17a99d1a9ccb48ee648be9ca80a1e63cc25831be90e171f6e1e16ab44fa8c942",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d444g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d444g0v0Filler.json
new file mode 100644
index 000000000..487a74ef4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d444g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d444g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101bc6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa03c005743dee4e5bf9484af36daedefbc149e0dd54e3ebaa08d096376c6c866",
+                        "s" : "0x12f0b09b1bde815f76bedfc3f18a4bccbfbe15505f559afa0372a10ce86c4188",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d445g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d445g0v0Filler.json
new file mode 100644
index 000000000..ab9621f96
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d445g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d445g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101bd6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb728c64532af07fc93b96bd927fd7610e3ce1e5604ce0af96c3b467627a4d4d5",
+                        "s" : "0x0fe53507c9baa1e65dd6119876240149a3fd283f285b0da195e2550eca03d5de",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d446g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d446g0v0Filler.json
new file mode 100644
index 000000000..4da3985b0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d446g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d446g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101be6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x29215023c7437748328b4cb9ffc03337e8cadf91a5cb324605f9cc1e0b68da7b",
+                        "s" : "0x7870df7cdf6bfcace735a27befc35f6d0868818d0dc1e896a568db493774c14f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d447g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d447g0v0Filler.json
new file mode 100644
index 000000000..67f667dff
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d447g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d447g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101bf6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x927b1ccdb775a4f18efa24210070e91507563c0c637c932e3f67a0cde657f5b0",
+                        "s" : "0x5923576b8e6c22c9309c1ed1cb6f3e1330ae0186d15720b89148d7b39db988d4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d448g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d448g0v0Filler.json
new file mode 100644
index 000000000..d10f167e1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d448g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d448g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101c06064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc107b27c3a9144607464ddc6dcd031419e1d63141b60156e748c86c06a37e6a9",
+                        "s" : "0x1527316d0e17504d565828390cec8690315412c1a23922296e056ea26d022d85",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d449g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d449g0v0Filler.json
new file mode 100644
index 000000000..16bb6eb28
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d449g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d449g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101c16064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x29222391fbdb25dc46000d66cba285f1e2d3d5f9cbb8d3eb84e00c2a4b60478f",
+                        "s" : "0x6aa26892daa19c54c64317fb1f0d3efa90ad2312fb0c3a06228cde4d46cd675d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d44g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d44g0v0Filler.json
new file mode 100644
index 000000000..fe9cf8fbd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d44g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d44g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x602c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9d7a2797d3834122ebeb52bb81514cdf017235ea32f4feae859bbaefb91d3299",
+                        "s" : "0x2e154f03c8b06d9f4cc380615adc716a98806a7a7c4b4719beacf4d80d2a3328",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d450g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d450g0v0Filler.json
new file mode 100644
index 000000000..8064313a2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d450g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d450g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101c26064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x75bc62340878b33bb271f815fb30b8ffb08a8766cb100fb1a29270693a30c0b7",
+                        "s" : "0x2764db4a1b88c0fdddeaf1215480f7b9b94f22991f111fd9e992bfe266476525",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d451g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d451g0v0Filler.json
new file mode 100644
index 000000000..016b162a4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d451g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d451g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101c36064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x94a85fe5dd23db304bb4a73069b554276de4faa5c8cf1fc77e21ac4461f47128",
+                        "s" : "0x5869e533cc3a7773c7bb1d875fdf1aae0a3adbe66450b99ec32717db34334194",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d452g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d452g0v0Filler.json
new file mode 100644
index 000000000..3242afd3f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d452g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d452g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101c46064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd2b619182b23b66c191f565005693eeba8e7a1e5d985002e070ce883a2413e40",
+                        "s" : "0x28269344e550ed6fcdd10860977720f1cce9bf607a6a34b05c42c39db31d73ea",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d453g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d453g0v0Filler.json
new file mode 100644
index 000000000..0db7beaa0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d453g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d453g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101c56064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa0ecffa6d99fe9c6c39510975b84a96d42cc30b9b6a70acb9e7cb08befff40f1",
+                        "s" : "0x3e49314c7726a1c7080b35c7002afe13aa12f5d53e942e06128aee41c135d65d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d454g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d454g0v0Filler.json
new file mode 100644
index 000000000..2d69b1ab2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d454g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d454g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101c66064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x43a2ec8e3e2afa47e93204580e09e4854f27ac90412cea79278fb43c03f0ae52",
+                        "s" : "0x7ae55a60ad78c84ad2874b3e291f59b87191aa0ee512bc8bbd0101c2c39af8c5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d455g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d455g0v0Filler.json
new file mode 100644
index 000000000..ac08fbe46
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d455g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d455g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101c76064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x75d1679d28377d063093494b92e8e84336ea13f80f0cd6f85ed5073773a3c468",
+                        "s" : "0x7ffd823ef734160c778eb4dfca5a0450299ac6d6438aa4f7e385a08fe9257bd3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d456g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d456g0v0Filler.json
new file mode 100644
index 000000000..befdcdbd1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d456g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d456g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101c86064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x782631eebf02b0140a72f76501b92f8978605e599927f18e66d4e8dc9bb7d639",
+                        "s" : "0x056738d3c2db19d4342ae5bf1ed845e65d908a30bebdbaf6680f4622c70f24ba",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d457g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d457g0v0Filler.json
new file mode 100644
index 000000000..d23007182
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d457g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d457g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101c96064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x784723bcbcca8a5b2adfc5d5cada91985a5c653d5756952bb4b4a5147a1bca2e",
+                        "s" : "0x1530ee6c336734db4b41e0d9bb8d8f8f9f164fc48f7c19175b1ca547b17091e4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d458g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d458g0v0Filler.json
new file mode 100644
index 000000000..b1e47bac7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d458g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d458g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ca6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x357793d8e75ff4d1c3cee04ce79918aac183894b5c6674f4f76f34ad47e8c182",
+                        "s" : "0x49ab129eb65da1dd080008e340d12dc9720a53b806818be84fe7acc81160cb2d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d459g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d459g0v0Filler.json
new file mode 100644
index 000000000..628baa713
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d459g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d459g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101cb6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x167d31dab2288ff9d58687509af2e4ff3e4ae4a10a2af6eea2113e0a3bf0edca",
+                        "s" : "0x253e67babec31d64d7ccf8f3a90cecae13072d96d7eb9be95997c049231e14e7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d45g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d45g0v0Filler.json
new file mode 100644
index 000000000..2e1dc5bc7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d45g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d45g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x602d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd90e9f69a434d388afaa2c780b338331e22d2025deeaec0564d46bc3fd99dab6",
+                        "s" : "0x6dbfdbe56ee9e51540ac9d99e5438acacc72e3f09fa7ba2d8e5e3cfa79319950",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d460g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d460g0v0Filler.json
new file mode 100644
index 000000000..aed0295ba
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d460g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d460g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101cc6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf71da34770cab5ca6a1b1aef3d7becf3bd019c1217780affe94e64391827489e",
+                        "s" : "0x73a98c3bcbf36571d5d0bf4921074866a11680765322b47a6389c355fe543de7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d461g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d461g0v0Filler.json
new file mode 100644
index 000000000..6194e89ca
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d461g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d461g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101cd6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x087fdd61902fac04f8809020b44e125b382b0dfef7488756b9e089f9f1580088",
+                        "s" : "0x3092c6cf9ba3db268ba8e1bf6ccf821eb545a4486c1eb727513c5c243b7d2cd4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d462g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d462g0v0Filler.json
new file mode 100644
index 000000000..b0d694e4f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d462g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d462g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ce6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3907eaec713cfa09d0cfecf0739104b8fe30fd598134862582fb8e4ccd98c03b",
+                        "s" : "0x408963c63e6390b6ff7c70a2ea9c7d90018296172bcbb178c91647ceb520b4c9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d463g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d463g0v0Filler.json
new file mode 100644
index 000000000..354faec0b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d463g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d463g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101cf6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1420472be4e4912c2ec53d174b533d614144732ab89cc5635c5b628d9991a82a",
+                        "s" : "0x6b51581c2e13be9efa2a4c2e07f1f18fb6e6755d3863d9009f521d42fef5109c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d464g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d464g0v0Filler.json
new file mode 100644
index 000000000..f95c9bd4b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d464g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d464g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101d06064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5bbb30d73fd4af8155e16397b9c29846f994ee4a8813eb9e6c423f652c200adb",
+                        "s" : "0x3cc045fa1373a898a29e60203d285bc511ef1c32d3acbfed07f2f31ac5592fbb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d465g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d465g0v0Filler.json
new file mode 100644
index 000000000..ad423e417
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d465g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d465g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101d16064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa7b1415e1128debc0a62370e48bb8a33a5c13e62c505ad0de05ad462716eeb26",
+                        "s" : "0x9cf5d6208809544ac8391712034e04c77ce6a4c8413d2abf37be57d3c11f99",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d466g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d466g0v0Filler.json
new file mode 100644
index 000000000..282631ac6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d466g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d466g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101d26064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x668758b5730acba4f1d79e5f4e7210cd911317dffadb4887808403de91b040ec",
+                        "s" : "0x3998135e5f3f9c497cca24c78eb8bcef521fdc6175972b060c76288d2c5a88a0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d467g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d467g0v0Filler.json
new file mode 100644
index 000000000..6879a8d66
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d467g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d467g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101d36064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x31fa4dd6a3f275030a71557157c2e355e5d3fec9e6ad0e4b82eee41fac606aaf",
+                        "s" : "0x5918be5b8af1564dd2a47dbec54edd81ca11e949329cefe5d768022537766c82",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d468g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d468g0v0Filler.json
new file mode 100644
index 000000000..00e7e85cf
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d468g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d468g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101d46064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x155d4d93133ab031f82dffe4eb065cf76dc6156feefd9c6b822e6d2e963036dd",
+                        "s" : "0x0d7826d1f12e4d2f4238892115cf2f0a84fc6ce9d951120e8b5fcce550374dcc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d469g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d469g0v0Filler.json
new file mode 100644
index 000000000..a127cbd39
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d469g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d469g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101d56064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x621879d8de417123911ae1ab12469d7847ad7d72d7f52d258a3e38688ccdd98e",
+                        "s" : "0x2649a206ff2fa8ba72ac57962ab01aed9d29fb8999d667578d09a61dd7fe4a87",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d46g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d46g0v0Filler.json
new file mode 100644
index 000000000..ad0464bd0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d46g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d46g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x602e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7c87ce76634fac320256e4ad7952beeefe003d00cb8855f863a3acc6dc516e97",
+                        "s" : "0x08d124d9d941b5ee5a6ab83796fd7760ef4a9725a9ad62b45b950ddebfc00d10",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d470g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d470g0v0Filler.json
new file mode 100644
index 000000000..ec49f6ff7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d470g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d470g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101d66064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb56c32c9ac06576936303f1d0b2012e7511f9c83e08a8cc6ebb28d52529b0a3d",
+                        "s" : "0x09eada2090461fef0636f1b47acacdcdcd26881aed5a1139dac428ec137a9481",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d471g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d471g0v0Filler.json
new file mode 100644
index 000000000..90577d539
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d471g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d471g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101d76064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1d585a67877224da06decf909973aad1176ad3fd2c513f0241e21cb6275ca7e6",
+                        "s" : "0x7be1fe2e8bcd4a0abcdbc2402730fd5b3746abb236f943a61a6ce9b3f9804cf6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d472g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d472g0v0Filler.json
new file mode 100644
index 000000000..655e8e101
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d472g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d472g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101d86064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x87b7b08a02ed4e6772df9f067b23d7abd2a9c0b4f421950ea694d8d86fdf443a",
+                        "s" : "0x35fa8d057ae36961a667f958964d9e968e59119ab96048d06064dce750c7e029",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d473g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d473g0v0Filler.json
new file mode 100644
index 000000000..d783042f8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d473g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d473g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101d96064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x251a1bfe99bd549eb2bd016a4e41a6e202d3e43a42d553944afa099bd3790195",
+                        "s" : "0x4cbc57eb2e9962c0b0d258ec0523e33d8b8178712f285b355801923bb2aa3aef",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d474g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d474g0v0Filler.json
new file mode 100644
index 000000000..42a983b5c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d474g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d474g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101da6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe2e69697a3d090f03a1a3501d852d4b93df019e5324c8056eec8d0833fa11754",
+                        "s" : "0x60060cbb3bf69b0cd5dfdd5847d936b03e91c199254564ec354957eaf9d3320e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d475g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d475g0v0Filler.json
new file mode 100644
index 000000000..b18dafcfa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d475g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d475g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101db6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbba516e062c2a50852b4097a386c25ef07d3ed5343a62af5ae16dd6553b511e9",
+                        "s" : "0x3246d1a388101ed2e530099b21cd55f963ca805f25a2e5dbce564c6d654c7316",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d476g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d476g0v0Filler.json
new file mode 100644
index 000000000..b059d8d46
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d476g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d476g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101dc6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd57d1b55b1a69533de3c188f919cc017900cf4ac38188729cd5d9400a154c60b",
+                        "s" : "0x718ef70242bf4be855de8a6668946ecd3225feb4bb89a9e11a3d99f74436cd3f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d477g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d477g0v0Filler.json
new file mode 100644
index 000000000..029cf9437
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d477g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d477g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101dd6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe85dd4680cdfd8f19de0739d1de48f8571b173045b816dff0f0e6dcd14ae66f0",
+                        "s" : "0x0bc7388511fccd574d828d9d8e8c6cb3089eb44277460aaf31326dcc7be50326",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d478g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d478g0v0Filler.json
new file mode 100644
index 000000000..246a4fffc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d478g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d478g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101de6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6fd2b2827a6b86ba5d5117c37805f034dac5b6fbc94b91208a1093d3d5e08494",
+                        "s" : "0x03756b6fdd5f4694c188083fbe361ce79ac2cf24f0c4761c4ef06223474cee8b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d479g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d479g0v0Filler.json
new file mode 100644
index 000000000..380caa0c8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d479g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d479g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101df6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb7cc62f8d4c485a690f85f2fdb980beafd73bd669bf9f3b877b19a18a7e161b9",
+                        "s" : "0x6f4c3488d0b2e24fde3821653c444b6bc0d93b990e168d44c0b1479f4a018c79",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d47g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d47g0v0Filler.json
new file mode 100644
index 000000000..cffdf9e1b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d47g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d47g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x602f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf544cb22fe7edb6cbc89447ba310a897a83fb70e58174bf69494b1de81b07a30",
+                        "s" : "0x6e57cbd6997b581e02408c701dcaf2952305c8d9cde44aa18c15f9d34ae008f5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d480g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d480g0v0Filler.json
new file mode 100644
index 000000000..b4c3e222d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d480g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d480g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101e06064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9deb3d44292ec943380ec83abc27cb7a645d28bb5e518e19140eeb91aa0d35a5",
+                        "s" : "0x17fb90931c02398e4e2634e6688cd43015c69c251e0299128e9be7d9de38e8fb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d481g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d481g0v0Filler.json
new file mode 100644
index 000000000..1425239bc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d481g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d481g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101e16064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfb6ae6b286fa4e486592661b5548c154f5c18956fb4a149a10d28f446f50c27d",
+                        "s" : "0x36867bed214aca3175e644c70c091894c2038d69f312bee453758ae3e5f53607",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d482g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d482g0v0Filler.json
new file mode 100644
index 000000000..42a80b68c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d482g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d482g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101e26064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe4b7c62c02511bb038ea65e174db19fbc4d2881b6a2f28b1778ebe8998b225e8",
+                        "s" : "0x63fda308563e285d570488f21772faceb5ab4d4daf294beb0ebdf03dbe844de6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d483g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d483g0v0Filler.json
new file mode 100644
index 000000000..20d257f89
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d483g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d483g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101e36064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x07bd972959534e4022bd5dd65e77a7faf27d8b35658d64189e135fe69d3790b7",
+                        "s" : "0x6bfe6b7e7a8c4dcab43aed66c0021999c1a26da04f5864d6f441ae822600d667",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d484g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d484g0v0Filler.json
new file mode 100644
index 000000000..1d81f4fb6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d484g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d484g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101e46064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaac03fa2f5fddd0a45af0681b7fc69a24c76821aaf68d63bb19f188fa901bf5a",
+                        "s" : "0x26ce539ccce13884548434cc9586d118e2d4b70f80240c4ba299e1846b9e99b3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d485g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d485g0v0Filler.json
new file mode 100644
index 000000000..a38e70142
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d485g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d485g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101e56064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc9e6876ccd4c6f125c0a163f41d2c4b9f798ec1cada0e5f2528b7b80a62c5b0d",
+                        "s" : "0x527e99ab8f3bfc2c0eca267cea5a027776416853a97cd96a53135ad7af53c7a6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d486g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d486g0v0Filler.json
new file mode 100644
index 000000000..a58b68e8f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d486g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d486g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101e66064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xee0aced3a47f1213a69594d39cd20b6642135d8f17653c20bee3b3c906d7fa3f",
+                        "s" : "0x3cc436a1a44396351acf04ceb4d4c489577c55507e035d2a6e2e73aaa282a54f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d487g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d487g0v0Filler.json
new file mode 100644
index 000000000..9a6735571
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d487g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d487g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101e76064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6c78c8508d7e4acc277b0236c9e82f2870875c5e647baa7472eecb8eb9530ffa",
+                        "s" : "0x0e99bad63bfab1ae96eb5648843232905aeb485fe52902f6af36702c757eefb7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d488g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d488g0v0Filler.json
new file mode 100644
index 000000000..d7d9690cc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d488g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d488g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101e86064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd0d64819c6ea271a5d4f290f61541b31eba2e4d85d71a6a3b18564e3aec0785a",
+                        "s" : "0x2648ff33c25d5121bcb549e605a092a88f860068a524f037f38127df89aa40ee",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d489g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d489g0v0Filler.json
new file mode 100644
index 000000000..7cbfff9b6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d489g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d489g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101e96064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0acbde7911e74d4570a210342efa9c63b840aa7a448ce7d70f10c240fb630979",
+                        "s" : "0x67fb30ef811ade6c752f671e3559bcb29496f5bbd1079f91878fe89938ea66bd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d48g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d48g0v0Filler.json
new file mode 100644
index 000000000..a7cee92e7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d48g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d48g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60306064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x668b2e6001a3796fbd1f6abf8ad4bdf1b1479c40c2b9f727f5845add3fd854c6",
+                        "s" : "0x07d2a7eda524f6dc07c9db2af3ef5b37a75245957b333130166568347ec115b1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d490g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d490g0v0Filler.json
new file mode 100644
index 000000000..e15563a2a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d490g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d490g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ea6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x286492eff4a6657dd576f9e21f0c7a667621a15824bcafca0034024b7d3dda41",
+                        "s" : "0x48a46ccf4f56eb16bf54d04506c8fb376dbc2acfb7d7ffa255f5599264036b1b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d491g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d491g0v0Filler.json
new file mode 100644
index 000000000..4216dcaeb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d491g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d491g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101eb6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbfc64af9f65f72df10dcbf791415fed1e239f9562f4f71b57a8856e6d92e767b",
+                        "s" : "0x74cc383fcab93ac248759c27d8a8a74d82e959e2b94692a0a900b8d2bc18f8ca",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d492g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d492g0v0Filler.json
new file mode 100644
index 000000000..5d0d5ee7d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d492g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d492g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ec6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcfacc9c98b6e838092498492ea74e51d20706fbb05d5dd20301a98a9cd212dcc",
+                        "s" : "0x3cab2d7a86eb25704f604ab6a5dd3b4620b4a405ccfee68033cc16098783f2e2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d493g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d493g0v0Filler.json
new file mode 100644
index 000000000..c22313466
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d493g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d493g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ed6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbd09031e517a912e1bf896d1634eb595a9977c86bc55ae196ac7467a34a178d9",
+                        "s" : "0x6ae735ac99a73e16d173a02ed70bbcc5c7336d1aa9b1e20f9e580077e337a4d2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d494g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d494g0v0Filler.json
new file mode 100644
index 000000000..212a2ccf7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d494g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d494g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ee6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3826ccfcfe8c9f96baafe7cdf962230050be5a1cca60c96337acbd7e6cfd80ba",
+                        "s" : "0x1558e245c061b2d6c503fcb47442075d87159e504c3d1c0019a25c32673d6a84",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d495g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d495g0v0Filler.json
new file mode 100644
index 000000000..56a25ba22
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d495g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d495g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ef6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x89fc30c00384246fb0295a966d7bbe5eab338ba3dd7efe068008bdd54b7645c2",
+                        "s" : "0x0156d392fe614f2e245bb263a89ed12db3379df1ba2146e4a420fe43a8349f80",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d496g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d496g0v0Filler.json
new file mode 100644
index 000000000..752af0efc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d496g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d496g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101f06064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x18d70c113442e58564943bad871c1b94b6ea82219ad817bdc7fe607985b49418",
+                        "s" : "0x1a409fcbe90cf73bbac772325c109bf23189c7f6c50e67472b9cf853826a0f67",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d497g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d497g0v0Filler.json
new file mode 100644
index 000000000..558c0c146
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d497g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d497g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101f16064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2ceb62bea32eeb7f313cfb662fcd1305f383cef4a9f1b132eac70c38235504ae",
+                        "s" : "0x3a204d34a9e420bf20a3dd161149be8ffc230c4dddc16a2216cd8926e7283939",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d498g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d498g0v0Filler.json
new file mode 100644
index 000000000..b82a5857e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d498g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d498g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101f26064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd489c01cb612b985717272bf0194f96a03b4550a83005be8ad18c5fc1100118a",
+                        "s" : "0x1ea0393b25a429ebb3a2a88285061c62fd63dcc2a7e165c28c9da02b8ac96a74",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d499g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d499g0v0Filler.json
new file mode 100644
index 000000000..83bf93463
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d499g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d499g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101f36064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x77825bf462991218c9ae74a1ece6c1b846ac4258368dbe0835d3f519000f4478",
+                        "s" : "0x7e0d84fab3dcf8667fba6e0169ab57edf7e91b49811c1afd27c3634707aa9908",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d49g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d49g0v0Filler.json
new file mode 100644
index 000000000..cdef3d4d5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d49g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d49g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60316064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x60d27b176993cde83b9f556405f4aaba21dacb194819cf2a3e2c857e9253fda7",
+                        "s" : "0x4d6ff014f5a16a54d9d73e315caa3ac60a761c44925e686ff3883ab1e848ccba",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d4g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d4g0v0Filler.json
new file mode 100644
index 000000000..350c008aa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d4g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d4g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60046064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x585bf9f2dc64cdaaabefe7c4fbbc72cc00656531384d38c9b878546fdf61a7cc",
+                        "s" : "0x7ab16ad9b8a8a73862f00366b31faa1fa55ec300110a2c4fd1ea30b3ca6f1aab",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d500g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d500g0v0Filler.json
new file mode 100644
index 000000000..57cf6e018
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d500g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d500g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101f46064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xab8c62d429509d1999f6d2d0cea808d2c66cf23cdc7128e70de83a55ff04cdbc",
+                        "s" : "0x3fe6ea1c0ef23eebedbd3974f2d8ca84a3f5449cad0bb82dfb792d0c7a435de2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d501g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d501g0v0Filler.json
new file mode 100644
index 000000000..8ea5572a4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d501g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d501g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101f56064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x851f8ce2d70b3d16e663d4644e41eb8f03732f99c095a05214a7b056fe83e667",
+                        "s" : "0x605d7a54c4bcbef26ddc39b8a55f0a1e9efdeab9c87ac12a6ff1c687206efbc5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d502g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d502g0v0Filler.json
new file mode 100644
index 000000000..d8a9a01d3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d502g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d502g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101f66064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcb25444433c0d92a19202ed411c815cd3cd0d1039db9426e05f65ea0f8f7ba74",
+                        "s" : "0x10c2ff5b793871c0bf894a0d14a34ce2b05b4f6a549790b57d40423ab59c9169",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d503g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d503g0v0Filler.json
new file mode 100644
index 000000000..4aac9f579
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d503g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d503g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101f76064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x39012467df96e295df180c312a43132e44a30551cfe2e2bdd685e158e9a0405c",
+                        "s" : "0x0c15f1a57c26f936584d4fb9fa77f9ad5ab967faa0520fdd3ee979eef50c83ac",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d504g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d504g0v0Filler.json
new file mode 100644
index 000000000..552ef3e7c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d504g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d504g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101f86064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6aecf7467b7d3c9b84b633e21669032a2c4399ed807535e649b8c1add57fb9c9",
+                        "s" : "0x2578f39e546bf175ae81fad5d425f60d97e4054cf26fb1826846272bdd1d9f96",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d505g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d505g0v0Filler.json
new file mode 100644
index 000000000..cd8e78647
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d505g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d505g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101f96064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcefe11acde9ede7dcfaa20ba0349493a95cf130218025cf833124cf593a8bf09",
+                        "s" : "0x35b82b4f21960846b5da249d5b3568ef60fe5ed9deda9dd608e82883759b6d06",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d506g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d506g0v0Filler.json
new file mode 100644
index 000000000..405617169
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d506g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d506g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101fa6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1c4ae6446bbf6e53c46d13464bb2e618c38282ea6a1a5c6df41df907060ec348",
+                        "s" : "0x38ec7497ac2b1b729b9498ae460b0792a5c0bc76097dd7c3866c58232b70ee4c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d507g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d507g0v0Filler.json
new file mode 100644
index 000000000..1c59349f1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d507g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d507g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101fb6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3ab6702d251600d72fee4a09e19728a2bf94368a75b90459b125fd412f3a3aaa",
+                        "s" : "0x4246f33b7c5661d2b5a702f6424644113cc965230380e6e6804689bf6df3e61e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d508g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d508g0v0Filler.json
new file mode 100644
index 000000000..86c83d277
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d508g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d508g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101fc6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0ff72e10183c93a934e8664d09298f3cec447a5c69435c60a62b85c4aec3cdd9",
+                        "s" : "0x43dd4e762e26a1ef88b786da32f6c8aad79f312a79c454f7d722d8c5cc31be7b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d509g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d509g0v0Filler.json
new file mode 100644
index 000000000..fe42898a2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d509g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d509g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101fd6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3c079a70276bf9765f86020b5701a14885566c1c5461c5be6db56cfcedf04e74",
+                        "s" : "0x2253bc57d33e1094d7c93a78b8a393c53f6ec3ea9270672ad9bcece1a21449e8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d50g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d50g0v0Filler.json
new file mode 100644
index 000000000..2b1f81037
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d50g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d50g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60326064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5e7467d4a88c790b421b4be45549300bc0e7cb62efe8d65644fc4da87de9b964",
+                        "s" : "0x7fcf78fb47ed8cd2f66a595be4e87cbdb9418bdc1666d38138a2bd7eef04462f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d510g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d510g0v0Filler.json
new file mode 100644
index 000000000..dfcade36a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d510g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d510g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101fe6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xae2c7f1d794f011b888858571b18c6e9e19f316fedfec3130130d579d9630a8f",
+                        "s" : "0x496de4ed824f78d459fc50ea8535f9ff16e1c8341164726c578f567569334251",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d511g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d511g0v0Filler.json
new file mode 100644
index 000000000..31694ae5a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d511g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d511g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ff6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x93551609731169026ed8a12789e5f251e6c89bbbbff56888e9453b7c920be26c",
+                        "s" : "0x566904b1b7ec2b9efd4fc69bf3b3f159fb28d28f37a231c0662729d5ea2e4815",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d512g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d512g0v0Filler.json
new file mode 100644
index 000000000..94a1bcd25
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d512g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d512g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102006064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdbaa8b5b3a4943eecee388ebee0724ee9b15f3fb0565dcdabf40236d497332eb",
+                        "s" : "0x66b30466c24675602222acc1ba5e215443f28cabd19c860c4bf947d2ea899526",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d513g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d513g0v0Filler.json
new file mode 100644
index 000000000..7978b48db
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d513g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d513g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102016064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x90d07e777b999338ac4a50a7ef94698d2b550d058af15f51d31889c0a7a47484",
+                        "s" : "0x1684ca0489caf35e0eb2acdfac0f3e03411dc7791163c712c2b6b6d27b54cadb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d514g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d514g0v0Filler.json
new file mode 100644
index 000000000..290ec7d6a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d514g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d514g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102026064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4bdd719d64cb65d1302ce780b48fc03ed8e4064c270de94105d60e3646fa8759",
+                        "s" : "0x6d2d61b9d3cee8a2fd75129cac4844304f22d90831132125b5b2c6acdb7e75a5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d515g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d515g0v0Filler.json
new file mode 100644
index 000000000..da62ceadc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d515g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d515g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102036064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb6d514ecc087af02eef989eaac04f35a0a08b674690fe249edaf2ff8ccec177b",
+                        "s" : "0x5fc7f67014cc72d917953d8e0c2114de4967854ae9aa8d00ed3c65cb87e30a74",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d516g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d516g0v0Filler.json
new file mode 100644
index 000000000..b2c3d8886
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d516g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d516g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102046064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf4b31fce647a33386b603b417e69fc7cfc147dd8dafaf11ab7d4171b4ea22c4a",
+                        "s" : "0x1922aaef0566937db7e2c8b906fea2bfc2d1065a0ca800b8f18f935f136aadd3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d517g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d517g0v0Filler.json
new file mode 100644
index 000000000..1d5abb389
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d517g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d517g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102056064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4e26d98e34858dd576437b1041b90f8dde989544bcb9051fbf9f8613c25ba33c",
+                        "s" : "0x5f6a5234e76573337ddd9b7aa44eb8f0630225418b335205064e42c57be14cb3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d518g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d518g0v0Filler.json
new file mode 100644
index 000000000..0f74431a5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d518g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d518g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102066064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9880a644cc37d8c834daa30d65850a63feb9a7c3ac4da645bb0b275fc77194a7",
+                        "s" : "0x058693fb3f619c008dc24c5189fe5de684af316808a569a2c7f34e30d3ceb019",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d519g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d519g0v0Filler.json
new file mode 100644
index 000000000..431a02203
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d519g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d519g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102076064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x505c402c27d7855a8b14e2ef634acc9607d3ce64a54334a052aade396abb5ed5",
+                        "s" : "0x47fbdac7e6f0502c36ef898f28f683ffdcff2f42af8d6668223e064812bcdeb7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d51g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d51g0v0Filler.json
new file mode 100644
index 000000000..05a81907e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d51g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d51g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60336064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x02a4741bc7dfb40ea66c6f209af7f9342d5110b3bce6de7de5a70a531bf87468",
+                        "s" : "0x421618cf0f043a697d5b0f2bb43d69f02b0cb6944c390e0168e8f75d74b06703",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d520g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d520g0v0Filler.json
new file mode 100644
index 000000000..547b772df
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d520g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d520g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102086064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x427f76b300c59d1bbc3c30800343c55169111575149ded217f0621ffe0b077bd",
+                        "s" : "0x6c9988c5e1a6bd52dcfc02689c70f06a330f20704dda6846c7031b8a68fec1fa",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d521g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d521g0v0Filler.json
new file mode 100644
index 000000000..817e154fa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d521g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d521g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102096064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x600a5309a0040c5eb81f89fe7ba845a9f253907e32e6950510b92e8d9513f22f",
+                        "s" : "0x03732990093c96d4a4b4a21aca5a33b6e5c4b28665a80f3f39b3ebe0f3cc5891",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d522g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d522g0v0Filler.json
new file mode 100644
index 000000000..9b6ff4c64
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d522g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d522g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61020a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1adf488a2408dfe9bf5ba482a1185b97244cf018fd5f0fb4dab14935f52b5ede",
+                        "s" : "0x771ad512591be9a5671dd95b93438b9187d1a4124cee5632817b2846de6ecb2a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d523g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d523g0v0Filler.json
new file mode 100644
index 000000000..a9de8b58c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d523g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d523g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61020b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe82d350386bd92a1af844101e2f19f152ebef9aeb5bbcba2449297ae5e9bb579",
+                        "s" : "0x7ea9a2d03ac4dced2acaf0fae4549aaa4e1ad8cf9a5579bc3906793680077230",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d524g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d524g0v0Filler.json
new file mode 100644
index 000000000..8e031cc87
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d524g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d524g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61020c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xafff79807b4c8a9d85a10a04205997c58de221bc61e07531757af37aea58d3f6",
+                        "s" : "0x229d5047e7b50563ed9a5a7f5e2b48114699457147b660d4b9c230a92d910eb8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d525g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d525g0v0Filler.json
new file mode 100644
index 000000000..3eb085426
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d525g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d525g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61020d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6900e1a08b35a0761272ad264f1c823e252ac5a8b43ab281ca18aa9277957f24",
+                        "s" : "0x7b52159331a99cc43af7d0957b2b2a259fde4f6fdc32e2ed93e4217275af78b7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d526g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d526g0v0Filler.json
new file mode 100644
index 000000000..b1f8b1ee3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d526g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d526g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61020e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x81dd18741e302863f9966a7911724d54c1aeba3418bfc677fe094135fe1970d1",
+                        "s" : "0x7eb26173946d4faf37f0980be759f356108a78d053e60908b6f141439e1dd4ed",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d527g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d527g0v0Filler.json
new file mode 100644
index 000000000..950a7e08e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d527g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d527g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61020f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3a2bb34858efd5d8f4b720477abab7996f68c1736c80c9a3a3e6dc4fc93622e4",
+                        "s" : "0x305de6dc2a36d6903b9d9f5a57af3206137f725063fb2314ce80890188f3f73d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d528g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d528g0v0Filler.json
new file mode 100644
index 000000000..df9a742af
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d528g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d528g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102106064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5889ec50c5cda95bc1d3e22fe5c3af856bcc90e0fdf381ba8ac00c5412723a8e",
+                        "s" : "0x0f1b749c503afe5301c7a7889ce823a4702cbbe37cd10f2baea0cc1fb3b3b336",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d529g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d529g0v0Filler.json
new file mode 100644
index 000000000..15396e805
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d529g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d529g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102116064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb39036d8388017b7c745fbe0167b616105c9342b4c20217e7046bd41fd6a4a7e",
+                        "s" : "0x6b52bae33d53f78d775b0e6a87d5b9ede0540fd686fcc565a4c56c2ccbdcaee7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d52g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d52g0v0Filler.json
new file mode 100644
index 000000000..aff2a32a5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d52g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d52g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60346064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf8bbef570c0da68c099c238011fec135820a039d6a6719815a99914b5c94cdbe",
+                        "s" : "0x446539e6a1a03a702f06746f4fbd757b91a6dc242ba59527c41e06355e5bf250",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d530g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d530g0v0Filler.json
new file mode 100644
index 000000000..0a2e869d5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d530g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d530g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102126064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf3afee3b49527a44f6d7ead60bbd0e0bcca0eca6f978905a0dc7329750cba23d",
+                        "s" : "0x2ee3ba5f9e83f389c523531644bfdd86e6e5bc4fb153567aa847b33dd79c18a6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d531g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d531g0v0Filler.json
new file mode 100644
index 000000000..b680735c9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d531g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d531g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102136064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x16e3b74c4166b43dff3104d73a3d273321b161a73c77807f4482dc41a0548d7e",
+                        "s" : "0x0c30f7cbe07116691416d4954b0da728611493dbcf8074531abe37c59db362bb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d532g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d532g0v0Filler.json
new file mode 100644
index 000000000..bcfe28729
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d532g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d532g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102146064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6ff50e426966ec0ed483ac97f564b0591349d018cd630504e2c151164647c08d",
+                        "s" : "0x6ec91997b769ec1dbd95cf589df24ad7a682c6faf25f6282f61c637b5428562e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d533g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d533g0v0Filler.json
new file mode 100644
index 000000000..c466160ef
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d533g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d533g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102156064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9a832d83f42a08b0fee4cb6383e37dad00ffd0d572c355c69468b65793ffd0cf",
+                        "s" : "0x42737f7cffdd08ee7c4c5ed3bbdb1b0aa32af2851c2caa5f2e466426a25f2d58",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d534g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d534g0v0Filler.json
new file mode 100644
index 000000000..22c7049ca
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d534g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d534g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102166064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb8babcb2df2635081debcf114f690b50cf46741e705b210b23198de103e548e9",
+                        "s" : "0x3a885c5789b0ad58189ba4114927a5ebeaf727c8f4937e0a5881ffddabf37601",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d535g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d535g0v0Filler.json
new file mode 100644
index 000000000..14a5d28d5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d535g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d535g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102176064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3d3075b76fb524b6b9d2ea053da8f5b2d5dfa2f94da7d62a5c7993e028966507",
+                        "s" : "0x46636c5723554f0ccb3c4beb2e908771ac3c838c983e3ecee7cc46b553a45a0f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d536g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d536g0v0Filler.json
new file mode 100644
index 000000000..a1d5bd1ca
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d536g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d536g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102186064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbb6fe525acf4c08d5f76b254537506b51daa23f97d98370725c1ba042a941aae",
+                        "s" : "0x4ddb3c2dd6ca7e7bb5117d2c7e997a3985876e17d858d9b4e5ac7c75cdfd7a4c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d537g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d537g0v0Filler.json
new file mode 100644
index 000000000..b87fe8799
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d537g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d537g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102196064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9d494df3335f553d78dde2ccced64dc09768fb82f671519ec3f6cbc8bac09023",
+                        "s" : "0x66a3d02bbd6d583b23d58ff460db91c913ce6fe71d9544b84d3f26b56c827280",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d538g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d538g0v0Filler.json
new file mode 100644
index 000000000..fe896cbc8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d538g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d538g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61021a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd1447b69da6296b089295824f7b3bf1d0e480e8b68e20b3c44c758026390c2f4",
+                        "s" : "0x6aa31283693ae386301d7719f817265a2d1d616839f1e29464e9137a714d5963",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d539g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d539g0v0Filler.json
new file mode 100644
index 000000000..cf63273d7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d539g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d539g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61021b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x284a1cda1959a24d3ce7ffa11035712298ed26cfd234178e6de17e112447fdec",
+                        "s" : "0x5359597775807a8eb24bb778ab9dbd48630d9eb2c6b18b3bc5f0803e34373a56",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d53g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d53g0v0Filler.json
new file mode 100644
index 000000000..34dc77909
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d53g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d53g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60356064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x41a9d734bf653c959164dba72cc84ebc9f36aee4d6d60437835ff40559d31c0d",
+                        "s" : "0x27116ccafb282442c0f211bfd3c00976d2d15d8851e07c31f27babc52adb772e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d540g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d540g0v0Filler.json
new file mode 100644
index 000000000..3632e1d06
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d540g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d540g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61021c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xde56a8dd5f4280fd904e9ccef7c8945857b3ff33925947f03297a5cc0880c16a",
+                        "s" : "0x5fd1bce63d4c8284dd81a20df7bc187acb3bb2347d0bf58a6a08f4bc9bbd79bc",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d541g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d541g0v0Filler.json
new file mode 100644
index 000000000..2fc6771ed
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d541g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d541g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61021d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc61c4bf9245ff2ac6b86638f314f8c96eae6432b63c91206d4795936b7cf720f",
+                        "s" : "0x5f2ae2b3d4bfef7c666fb07b1bc3570bdc3393f250d3f2620c18ea544a61d35b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d542g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d542g0v0Filler.json
new file mode 100644
index 000000000..23adb4ed4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d542g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d542g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61021e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0105e09bd044c7c22c1ba37426daa83d3655fa019f092b96342bb5dd555e1568",
+                        "s" : "0x0e63f87e1289cc1740306d77c07fbe3ef45342e15f4d88b92c0ca8735fb3f4db",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d543g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d543g0v0Filler.json
new file mode 100644
index 000000000..2a362c281
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d543g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d543g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61021f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5783efb081b8ae70563bfb132c86cc7c0ef4a992df6b46f9bbd1a2560956bf84",
+                        "s" : "0x2c3de68be4665ff43553ecba57330e9ee500104bc1ffe69e9c1edb8a51b59074",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d544g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d544g0v0Filler.json
new file mode 100644
index 000000000..aacd09bd8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d544g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d544g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102206064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeb7714a5cef6a42428ece7242e07510df80dd074fc34a09bcc8c9f002db164e7",
+                        "s" : "0x5547bfe1ebba8a0472b33f8c268e5b4ed9bed02165519c5a0541bc48f467ab74",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d545g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d545g0v0Filler.json
new file mode 100644
index 000000000..e4b1b885a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d545g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d545g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102216064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x644828d435b8c61647f666190e2e1ec706fdaffaea51d11658d45d108f693ab7",
+                        "s" : "0x6b4ea9ff78e6ed8bc1e73a9132ce8062696c21be99f994d9cad577e1471b625b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d546g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d546g0v0Filler.json
new file mode 100644
index 000000000..8e880c56c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d546g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d546g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102226064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc5f526ed10eb961601387b529f8b98a3118546c8d510b46cad74ad06cfc57413",
+                        "s" : "0x36038d0743e501acf0d96dc1656a0dd52c8883cdfb609ad4e1f46038bb52551a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d547g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d547g0v0Filler.json
new file mode 100644
index 000000000..ee28b82ed
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d547g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d547g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102236064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4989e86940a47236563f4f8347ac0a9467ea40c5b728b7739c0351c95653304d",
+                        "s" : "0x5cc0d9dd07ce37fcb346f5046fd468db7e476d1a9f770fc3bd0098ccb90bf0ca",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d548g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d548g0v0Filler.json
new file mode 100644
index 000000000..51dc25ac4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d548g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d548g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102246064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd22d2f7cca75ae559097970a58fc9712a137e3474c940a2973e162403a4a57cf",
+                        "s" : "0x7c329f52c89e5fbcc137261d011333f97c5520e7ff8f490fe582896024e9a944",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d549g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d549g0v0Filler.json
new file mode 100644
index 000000000..268d274d4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d549g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d549g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102256064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x05c2d7ee98dc7b9b8600d5f70bb1f6d487f3a268d335261eaabaf295125faf24",
+                        "s" : "0x14642f12d9e7a919c265f6ce2305c012def9ff66c79f6226f4687ad1e47dc084",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d54g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d54g0v0Filler.json
new file mode 100644
index 000000000..fc0acc648
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d54g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d54g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60366064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3feb874df2a58e8249fd88c04522bbd2417b4eca742e497a4eed1c40d9e6c3fc",
+                        "s" : "0x371262ed50cc7bd0e09d49942520714225637b3b6a5c828453b55dc66c057bdf",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d550g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d550g0v0Filler.json
new file mode 100644
index 000000000..bf0966083
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d550g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d550g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102266064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x20c27387a5bab05a874a3f9ca240e4f471ab6b4c566506104e930e5671d83981",
+                        "s" : "0x1b731701e1f215aa32b3fdf0794a0ef55ee03acf1391ee0d0c6e3ee378e96f21",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d551g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d551g0v0Filler.json
new file mode 100644
index 000000000..db699341c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d551g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d551g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102276064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb88b5d10b49b672567dc3c727f8403dcfcac53be8ff699cf48c21a6b01e3dc0c",
+                        "s" : "0x6956157de59c5e046f2a1c41b9f5992a05c1a9fa56aec1548ae8cd8ddaddf38d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d552g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d552g0v0Filler.json
new file mode 100644
index 000000000..688b7e49d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d552g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d552g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102286064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc67994577bea46cd6f71a8d0ae7903806fa369c724e320cba699ce0e6601841e",
+                        "s" : "0x6bed228a6adce3bdd4757d3be7b805e7de1e22649ad465caf030bd4204792427",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d553g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d553g0v0Filler.json
new file mode 100644
index 000000000..53d59bd7d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d553g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d553g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102296064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7ad17153b102c5e3f614ed7b25d8546ee6fd28daca860d80b6cdbfae59a69a7c",
+                        "s" : "0x27182945d7bdb2a802ec2f019d6b0961293d4091333efa1e80c9fc5f1c5aeb21",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d554g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d554g0v0Filler.json
new file mode 100644
index 000000000..405ac5d74
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d554g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d554g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61022a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x606e2349f873c2e1f5a159780f84efb0fd6598cf6caa81888977b4e6e8cf739a",
+                        "s" : "0x108e041eedb82289e14f294534394ea3dca2d355cf8aaaa3c57f5a7b08564fd3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d555g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d555g0v0Filler.json
new file mode 100644
index 000000000..f5025c85b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d555g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d555g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61022b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x811ea376b967b09cec09584da7721284bf9e414dfdc20e4770cc3a61cd28f3a9",
+                        "s" : "0x5296d262ba337ac8ab1d89e28f136364daa3a7d88579093bbe212ed7e1d80dd6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d556g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d556g0v0Filler.json
new file mode 100644
index 000000000..a2b582fe2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d556g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d556g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61022c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb1aeec618fdbfd95bd4c6f39e62d52e5845b97927fc1e13d665f10036372d4c2",
+                        "s" : "0x044a2e54b72b3f86daf844931237911a610433cfeb6c85502ce07c7886f1c07e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d557g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d557g0v0Filler.json
new file mode 100644
index 000000000..32dcf93cd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d557g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d557g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61022d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x26f7ebde639ecee2579ba9891695d8d9e3211a7c1904fec6c396520cef310a82",
+                        "s" : "0x62fdcd8c32bd03c03dcaeff3a713a0516e11734178136f44714289374cfc9141",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d558g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d558g0v0Filler.json
new file mode 100644
index 000000000..4d0d4cb2a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d558g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d558g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61022e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0e10a7f67f71b9794f9240f01c835b706ed49f82c4c61f68ed73f5e601a67406",
+                        "s" : "0x407821b678ae81577629b67a6a0e49a4a6ab257337e08860010c615ab74440e3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d559g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d559g0v0Filler.json
new file mode 100644
index 000000000..85834ac6f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d559g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d559g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61022f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5fe833cc7ecaccfc5848125a15607a0fef7e45d05995b87105f39d845e3be10e",
+                        "s" : "0x34f7eeee9734982efd4965d1da06a83426b3737f0649594f5289607d306f2a5e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d55g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d55g0v0Filler.json
new file mode 100644
index 000000000..658b8810a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d55g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d55g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60376064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfbe18a3dae9b5f75075f5003bfabb79dcf4e51a0a724834561faf1bf0935a14e",
+                        "s" : "0x5623d05dc2a26550f67445eb0920575760d74065a078342545fff9fe02180917",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d560g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d560g0v0Filler.json
new file mode 100644
index 000000000..3dc68a47a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d560g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d560g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102306064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x31646ad235628645d610fdf21c23ef9e1a64d948e9983c3664d40cfbc93efd30",
+                        "s" : "0x5fd7a1933c788c3d25d73ab41733ed898fec1e45e708c198ce388b5e776856da",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d561g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d561g0v0Filler.json
new file mode 100644
index 000000000..dd36bffd4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d561g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d561g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102316064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdf3f1a04473505ef5dd7876f07ae16bbe68a65faf2450f61c5875af97caf9e97",
+                        "s" : "0x43753252e4ab7438826350f63d3291b1ae41479a84b97ffff300156ccdab484a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d562g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d562g0v0Filler.json
new file mode 100644
index 000000000..b2e5bdcf1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d562g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d562g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102326064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2b2004fa157c4b7b132e5de34b6628bf78813a13c223bbfcd86b5618614a32f6",
+                        "s" : "0x17c63d149dddaa0e2e44e2df5cdf57de4120b697b5c22af67d6c8a6e42625b62",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d563g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d563g0v0Filler.json
new file mode 100644
index 000000000..80cf61267
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d563g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d563g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102336064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc586f2b382d7abc77c1ad00c46c05b0eb8c00cdd6508f7c6521f79fe84d2df",
+                        "s" : "0x58994e546ba9655669bb8369630747e4f8ab1363b3be0b3dd2102cc4a4cb4b63",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d564g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d564g0v0Filler.json
new file mode 100644
index 000000000..c47559a7a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d564g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d564g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102346064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2b5bf73785e25bb75bdaa70cfa376496a4b166a3d5cb46855d6acc9d71a4fa40",
+                        "s" : "0x4abd6529259281b3980b5420f495e5faee1757e8549aa56af6575f8cdd234d18",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d565g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d565g0v0Filler.json
new file mode 100644
index 000000000..1ac601728
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d565g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d565g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102356064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x943a40b0b437d58e169a4d1678d9798912f5e5bed4bd132d826b0056b31bda2a",
+                        "s" : "0x568ab8e6bfccd877e681aa6dc17a34681d4cf8069d168f13cd1118a3e7d5dd00",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d566g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d566g0v0Filler.json
new file mode 100644
index 000000000..9c20f97bb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d566g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d566g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102366064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x905cead42bca5f1257fe0e3674ae4bf9415a3b6d0a691289a825df8304274883",
+                        "s" : "0x30f63c9bbdeb0738598c8438d35589b1a75f5d8469c1f1fa239525a077ffdc5f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d567g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d567g0v0Filler.json
new file mode 100644
index 000000000..d6b879ab6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d567g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d567g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102376064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe3bed607408b87ae7282f4088e4cbd80eb5539d59f3599df34fd1336c1a3684a",
+                        "s" : "0x16d7ca7a604de8af6c385d2baf3e73830997ea94cc7fb4ec1c3d09e6e6b75304",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d568g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d568g0v0Filler.json
new file mode 100644
index 000000000..76626270c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d568g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d568g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102386064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb789495661e7985f6bbe594359c5c2b1ce23dceabeb00b66754a32d1f854e3bb",
+                        "s" : "0x07bf9bf31c4f51ce2bee8eeac40e803f5920f198c424612831858e8662588a45",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d569g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d569g0v0Filler.json
new file mode 100644
index 000000000..185593e36
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d569g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d569g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102396064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1d7825180a8f39c97f0c111807735bd3ada063609f6e2bdcc5d2c3c50efe1875",
+                        "s" : "0x3880c67b48e66dae69c100bce3a1743ba2c104dda7ed9154a9bfaf750883bf9e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d56g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d56g0v0Filler.json
new file mode 100644
index 000000000..b33a71d38
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d56g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d56g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60386064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0f15b797b27aca03da843d851320fa527c0198851b0f3b286d6dd573c149ddb0",
+                        "s" : "0x2b9c7b5b25d67253bdf0f5d3828e4d913af5e2c62b00131ee3e0773afccf6e7f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d570g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d570g0v0Filler.json
new file mode 100644
index 000000000..158bcff73
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d570g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d570g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61023a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x33e6b24b43359268afcea4303f51e2ba0c41b26e27dfcf83369bab61eceb0c44",
+                        "s" : "0x320416040902813db8fec88b8e8ed97994947a6d90c6411c382f37730731240d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d571g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d571g0v0Filler.json
new file mode 100644
index 000000000..483629af0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d571g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d571g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61023b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5da76a5ca8876c3b7b9c1e7ef2e1e6c627a709cde567a16beba080cf32e5e0e2",
+                        "s" : "0x483906bf9ffd5d141d43b008dab16b4a057a6a92f27643bae6fe0cbc85a38f32",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d572g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d572g0v0Filler.json
new file mode 100644
index 000000000..1d6e826bf
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d572g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d572g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61023c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2d1b0fa60058c842e61091bb105ef6967f7953efc25f1d8268571bd2aeb876c1",
+                        "s" : "0x72c2eaae7134cc99bff3648169c0a861b10849a6f0f0c6ea8fc3345dde7338d4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d573g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d573g0v0Filler.json
new file mode 100644
index 000000000..1c01d1e9b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d573g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d573g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61023d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4852a48c1d1626472f8abae611becc8fd5e71b5a81526236421c381f2e2fd6b9",
+                        "s" : "0x5ede45352ccb959f124de8da523152f0f134ff2c2c6794178fb03ccec085fe6d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d574g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d574g0v0Filler.json
new file mode 100644
index 000000000..7b2761c61
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d574g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d574g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61023e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x586fc5c2930ff1d5b65a263b1376110c9cd7339f81355b5252017e95904cf6a9",
+                        "s" : "0x12c469cfa97c63f0687fd6e7580fbd3347208ee93bf1d33fd162cf615777b5f9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d575g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d575g0v0Filler.json
new file mode 100644
index 000000000..48d32f928
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d575g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d575g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61023f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5f7de3f1a5ff77ecb8cceb7bd31aaf807fa4698be5735aea0ce2500c00b4473a",
+                        "s" : "0x5f37f6530c25608e80bc03806d80be0f720c7cca9dd5ad6e84a009e3a567b467",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d576g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d576g0v0Filler.json
new file mode 100644
index 000000000..821ce7c5e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d576g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d576g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102406064526000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4181280ae6069f90ce10ff5cd4964ef7f2406efd606ba16d5a618da90dd7a502",
+                        "s" : "0x54ead4107c282db428648d8843df1082c87a08856dc8a0fb91ad03325873692d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d577g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d577g0v0Filler.json
new file mode 100644
index 000000000..bd476f658
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d577g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d577g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102416064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9b350e87443e157f772a8084f93b7bc2cb6c894bacbff93983927ac3ba8c9658",
+                        "s" : "0x0adbea862f32d3f85437a8f12f324cbe57d4351685683dfcd2187d503b626327",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d578g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d578g0v0Filler.json
new file mode 100644
index 000000000..c529303ec
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d578g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d578g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102426064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc93adedfc4a3d0f075b2498bee2deb34d119f89c73507ae8364ce2847c918d1a",
+                        "s" : "0x1f7134f74acc5839269bbdd6a04080b1b0ae31a7c6aeab2bf6268132c67a811f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d579g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d579g0v0Filler.json
new file mode 100644
index 000000000..18ce31458
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d579g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d579g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102436064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2e9d9a2677d403ad2cc64c8f406ac6b2ee9968e1f6ed475d65cf96ac53c2f979",
+                        "s" : "0x12073499aa79160255eafc7ae8067c20cc3dae0741091e3addad48d7ad6519f1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d57g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d57g0v0Filler.json
new file mode 100644
index 000000000..df0fc99a9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d57g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d57g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60396064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x25dacadc98d99efa32cbcaa151ea2b3cb7c4c24312f0ccb27663b1546c0288e2",
+                        "s" : "0x3bc3b4fbb69e9ae9adf7663ca024d67c5764d33b81d5d173bcc451a706287920",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d580g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d580g0v0Filler.json
new file mode 100644
index 000000000..6b1564b3a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d580g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d580g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102446064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x03e41fb1fa7a0c6f5ba9f52eda9ebe37d8e48e05bb3bc5fe7d6ab7897c603382",
+                        "s" : "0x4abe68d4c3e65301414a256c0dfbc01ca07e25fe2a0ce519d6b60d5d3fdf910a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d581g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d581g0v0Filler.json
new file mode 100644
index 000000000..52c7c1822
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d581g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d581g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102456064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa655deaba7d76cbe93d9f6f9291a89abd047dd27cb9758f32b8fa58b94f6a289",
+                        "s" : "0x6497a7b26941ae3e087260defc4cd2fdacc7778623a735557a2efa9086947ede",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d582g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d582g0v0Filler.json
new file mode 100644
index 000000000..d2fe4acf1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d582g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d582g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102466064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbed7242f2fa8ef09e854b821440247edf3adb2061a22f24a759b9ca670b37763",
+                        "s" : "0x2d8d7205da23ac31a46c69dba899d386f6c3eb632ade3c10c49573866229d35b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d583g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d583g0v0Filler.json
new file mode 100644
index 000000000..d23cf5667
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d583g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d583g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102476064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdfb6ba42944bb58501292f566234f7bc0cc931746c1bea993f33bde7579318df",
+                        "s" : "0x1b133a10f3f2e3a0300364fce5c2bb970cd4bf6f4fcc1882964d1a32abc8234f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d584g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d584g0v0Filler.json
new file mode 100644
index 000000000..240a02bac
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d584g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d584g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102486064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8eb31b92d67707ee0b9105fcf20a907a55e4717708d7598877ac80a53a93ddae",
+                        "s" : "0x55b96d429c4446b789c36f259763f4f24b4aada05202ee90b028bc6bdc796ae0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d585g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d585g0v0Filler.json
new file mode 100644
index 000000000..5020420a9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d585g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d585g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102496064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3b1ebfaaf1efa4ecaad84c45dd1a360b13a9e3f4afa5251d61877771f4f5f123",
+                        "s" : "0x671cc94b01cf1c1ad97ed6113b7aac84c4920c913fa98364cde35c32c14659d6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d586g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d586g0v0Filler.json
new file mode 100644
index 000000000..1799d69aa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d586g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d586g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61024a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x03d108360b79e98655c0dbf09eb0864c2a27bb708a8198ca8d62f2a3d9d5aa2e",
+                        "s" : "0x142f37ab21c00cdae8ea8bb558e3c8dffab8945129b1382ac2cfcf87fedbc163",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d587g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d587g0v0Filler.json
new file mode 100644
index 000000000..9e6f5c724
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d587g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d587g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61024b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x32109975f350cef46903db3c98e6fce8b31ea8a1c25f7c0c56d9c76fb91216cf",
+                        "s" : "0x0292edf46b3dcbb88f7632245ba6387e00ac3db00982a3719f79829f373d3595",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d588g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d588g0v0Filler.json
new file mode 100644
index 000000000..21b3fa812
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d588g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d588g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61024c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x71814341ec0c51af1fdbdbbe064243c8782a6413baad90ba45375c80c22c5fda",
+                        "s" : "0x5ae4f4caf2157187e00e8e7c516ab22bb5d0c6e2a669f041798baf7964fa9cd7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d589g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d589g0v0Filler.json
new file mode 100644
index 000000000..8064ffc10
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d589g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d589g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61024d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xff92f3682152a4d428e61b379b7a903b860b85faf117da0afc44b6e035e6ed38",
+                        "s" : "0x4940aa9461e937822d9bbbf8966a60cafa6b299440b659b8efb7b81838f4129d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d58g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d58g0v0Filler.json
new file mode 100644
index 000000000..a13f032a6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d58g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d58g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x603a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4205cf050c87e9d38306359d46d1d3a44e36c3f9661b20dbde35948a3b6764de",
+                        "s" : "0x2a0c39c8f26b4f5c58b63a53177b704acc411eab04f1aa15007938a67e3ae2f1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d590g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d590g0v0Filler.json
new file mode 100644
index 000000000..d78c85b31
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d590g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d590g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61024e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xae772ce687b344b861de8eb8a6c4266857c38df86fffc94b45a91ed802bce403",
+                        "s" : "0x66fdb20c86922d5e8140fcec44f1d52f8033587927298ec29ca16b5e14221e4c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d591g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d591g0v0Filler.json
new file mode 100644
index 000000000..f65a62eb9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d591g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d591g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61024f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd29c0af09764ca2cd3c089e824f91c7ecbf1fdb3bc70f999ca10a7cf9b7ea490",
+                        "s" : "0x742312ff95efba6bcbc83bb6a21f2cc1484b79290f4c3a1ae8644c0e7a60ccf7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d592g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d592g0v0Filler.json
new file mode 100644
index 000000000..0a2a2eed2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d592g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d592g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102506064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6a5d702d6a1778aca7963e9668507b4b55ab22ff1faa40590c6d7c7e976028d1",
+                        "s" : "0x71296e203a30458d20f139bf10a741da6c8c99d117909f84d82ac6020b1720bd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d593g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d593g0v0Filler.json
new file mode 100644
index 000000000..43db898d0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d593g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d593g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102516064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7b87b853438f062e432a083376fd4771c2595720c2be6c96a30579f39a122b08",
+                        "s" : "0x210427bc8d739761e6a640f4e728f31f95ce8f9643c3fce2263e6e7e16266888",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d594g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d594g0v0Filler.json
new file mode 100644
index 000000000..2322ddf63
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d594g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d594g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102526064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe762394e8de65383046eeab34c0bed83f7970b4be587f59ed4c35ab2c7fc1088",
+                        "s" : "0x0ecd5ebec2463d835ac67466a3abea08cd6aa3f63227607ba40bda50b73becce",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d595g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d595g0v0Filler.json
new file mode 100644
index 000000000..51dc35c52
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d595g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d595g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102536064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa76555e47e872d70ec0adda5f8b52278c555e0e7a1b05895d652cddc5c734a2f",
+                        "s" : "0x28919d00f55480cc4b8adfafb7b75ac19bed5c69ebb491b3353f9a520391dd5c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d596g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d596g0v0Filler.json
new file mode 100644
index 000000000..14ac3f97d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d596g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d596g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102546064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd194fcf249883eb0f8b0027d8f178346c6e7ca6f5bc287ecfa11bfcc0ff63f7b",
+                        "s" : "0x3ea6f41174612fbfcdd1cdbd1292f664c076c613e60f2db89396ff6941ee4bc1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d597g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d597g0v0Filler.json
new file mode 100644
index 000000000..a7495aeb6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d597g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d597g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102556064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc58cd0801fa69c957c6af71933d1ab401977a63a95e9e4a00d37f0012e6d3a41",
+                        "s" : "0x09fde53805abc21d262f6e7bf69fe8023a8793aac8cd67f5eae6846e8f05fa51",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d598g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d598g0v0Filler.json
new file mode 100644
index 000000000..a6aa1009a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d598g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d598g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102566064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xecf3c7f664bc58beeefcb5c7d4c24ff9417773d1ac5789d54db156742070762f",
+                        "s" : "0x2c38533bf3ab533d4ea2b34712e984ac9e55a1fdee592f3534b666eba708970a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d599g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d599g0v0Filler.json
new file mode 100644
index 000000000..7f054a83f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d599g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d599g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102576064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xda5f9a65984cee4cd44209f68a3c80f5f8464151ceb853d6638d931618ba54f0",
+                        "s" : "0x1a921594db45c882563e090f2d2b9a37360021d04a0e0a2eab05eb98888727d4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d59g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d59g0v0Filler.json
new file mode 100644
index 000000000..38592ee2c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d59g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d59g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x603b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe8f6e3ce8ac7111eedc6965c6d3d073ba61ecb2ad2c92c0c4462865d0efaa453",
+                        "s" : "0x3cc6c1562165d9a495ae5ff3e9d2f5da3f0205aafe0d17d73a50d1b2dd0f72c6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d5g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d5g0v0Filler.json
new file mode 100644
index 000000000..bef9109f9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d5g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d5g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60056064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3efb99780b20e8d546e3dc8fe6dd705aa0d6f619463b90cb8421c5f05bb4e0ec",
+                        "s" : "0x19791569696099bca51f0ad5bc234687c5384247713090fd1b33f012fd9d6df0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d600g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d600g0v0Filler.json
new file mode 100644
index 000000000..e1344dc88
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d600g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d600g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102586064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x679c1e37d5831dc086ed3e1e50fb38f9b95fa37a76fc5bbe7039fc9c8af0759a",
+                        "s" : "0x4fa8c64ad03a8c3780bebf9f45caccd4e8139a194bb3352da3e89b8916fa4b33",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d601g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d601g0v0Filler.json
new file mode 100644
index 000000000..040c9513a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d601g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d601g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102596064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf9f8e207e2804cbe0c622a188069e06cf326dd17711f47bb1a666fcd9044c0b7",
+                        "s" : "0x75f5cebcd372d9c5aa783ea2facd23d7320bf0d1712d3d5061958b2fe1e74529",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d602g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d602g0v0Filler.json
new file mode 100644
index 000000000..8cc059d7b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d602g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d602g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61025a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe1b31ca7b5509cb6816e4b8182572549a59e8facc34c25f758532f7ba2185a89",
+                        "s" : "0x0a5206bf5495316e6449a691c2b8c2a720c7003172f83841dd09977f01126bff",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d603g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d603g0v0Filler.json
new file mode 100644
index 000000000..ddcd08503
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d603g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d603g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61025b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1965e7383b50f0caa2e0ec6be92b44493d12c6c07739075b8e784ca2b94a6387",
+                        "s" : "0x565bf3d1a4bc63b27969fabe7f0a158aa25d40b72ceefea11c2961a07daeffeb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d604g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d604g0v0Filler.json
new file mode 100644
index 000000000..3f4b19a7e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d604g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d604g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61025c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe6e5b4047db78ae381d96e850f4dab18e94d7b218c4b4f0e2007ce5881d954ea",
+                        "s" : "0x40d52743551d414624b0020a2b2dd2ab8451ab9930ed289df30aa1573db00de7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d605g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d605g0v0Filler.json
new file mode 100644
index 000000000..66d05dfe9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d605g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d605g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61025d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0a8bd08944d2e7196b2f225392acb1898ab21b6c0225418a2d19f8c7e108fe8d",
+                        "s" : "0x19cc06b94b1b38e65ae0ecbe2b579cd5c43702ddd3fb0c0c7c773f0af0e5ba75",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d606g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d606g0v0Filler.json
new file mode 100644
index 000000000..92f2268c9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d606g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d606g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61025e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x618b338d129557643167faba45a4b4745096c6aa91cdd7807af76721e78be39d",
+                        "s" : "0x0beee8d7bc8ec6f1d1f517ca155a4658473bad4db37a658fc2d7757a54b8bd28",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d607g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d607g0v0Filler.json
new file mode 100644
index 000000000..02214b09e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d607g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d607g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61025f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x91f9c06088d459b2143e8ec16fcfb4ed8c1819923e01ac88f4328dfc45bce0ba",
+                        "s" : "0x6a6a7af6c7f8a6a260fb421ceddb39c36f9436cb216b16d50e2b43d176cc4372",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d608g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d608g0v0Filler.json
new file mode 100644
index 000000000..7df1999a4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d608g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d608g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102606064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xab5014f00d2e5010ed8d60ad1a9932f180b67227b31ca494f6f20fc804e6b226",
+                        "s" : "0x7efc1372be747d1f77768af1a09687de48dc33bc73596b56d112ade7d3b5d4a6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d609g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d609g0v0Filler.json
new file mode 100644
index 000000000..510109a3e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d609g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d609g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102616064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7e70de98f29bca75862c73e25dc7371cd22a03ea09a44b25f4f8fcbefa0d6197",
+                        "s" : "0x4482603322947f35837ac8d118df2566a641ba3006927174fc1915d6a38d1a17",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d60g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d60g0v0Filler.json
new file mode 100644
index 000000000..a65a864c7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d60g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d60g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x603c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbadba9ee05d0fa32f2a64f04b845bb32ea29a2440c3cf25a43497e57a992d3e2",
+                        "s" : "0x43ef1632a57b85f4b8e3b808ec62c2a02647ac109df6ae77cce09da27270c123",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d610g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d610g0v0Filler.json
new file mode 100644
index 000000000..bb199c1f6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d610g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d610g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102626064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd452c0dccdd393e99c4b42127f52b6678da5e5c367cbbb2b5588ca5401d0d574",
+                        "s" : "0x5ce7c6c2dd368a17bc56c2a8f07c613e8983903ad083f02688b0c8a97bf21191",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d611g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d611g0v0Filler.json
new file mode 100644
index 000000000..f8991da58
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d611g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d611g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102636064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd4e5dbfcf0c2668bd5b21668f0e4b743347c66406714914f132cd8ec83e190db",
+                        "s" : "0x6e96dff7e4ad24115f0f556e3056494ad5a9e99b680fb48f49690bd92163bc85",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d612g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d612g0v0Filler.json
new file mode 100644
index 000000000..96fb72471
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d612g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d612g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102646064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9f8f5cad0f0f04b9303d2d1ad51b782016902061031f3c952ef96c45dadbf256",
+                        "s" : "0x077b4898624e117f00d65fa9b3b4cd2f828644136503f5480bb2be09aebeffa2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d613g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d613g0v0Filler.json
new file mode 100644
index 000000000..00b3ed31c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d613g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d613g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102656064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d87210a7cc43909743f67823d3f3844b745b9d71813ec891f99489243ac5fbe",
+                        "s" : "0x6dcd30c6932338887f4eb1b18dc12116756a08a344a0ce3502744574f2392606",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d614g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d614g0v0Filler.json
new file mode 100644
index 000000000..7291212b2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d614g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d614g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102666064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb102360b429742959ee55eb0296b7cd23984491859cadeca8aec4428c19e7c07",
+                        "s" : "0x7c88fd68a2df78cc53a896ec62b5fcbf60609d0cf1804dbda864b3b4e383231c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d615g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d615g0v0Filler.json
new file mode 100644
index 000000000..8161f142a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d615g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d615g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102676064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa18e8106c1904ac3cd1361cd5db97325e58004df9c4f7da903ac932061d2dd96",
+                        "s" : "0x5764d5524d93b1ddb873d556640d90829b144cf383c74625c44f32d08919bcc5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d616g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d616g0v0Filler.json
new file mode 100644
index 000000000..1783f1359
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d616g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d616g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102686064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdbd4e54ce3bcf82e5aa26069c1a2b78a47ff4699409872e5101ec6cdf3c7424e",
+                        "s" : "0x250d72da1740f6028bd5b26a3dc9cd51b2b3c4dbf847d1db82c2da7f3e93f37c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d617g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d617g0v0Filler.json
new file mode 100644
index 000000000..bc89191c4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d617g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d617g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102696064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa5502eb7e56d9e58badb256b45fcd84f5ec2cec6c3f821795a707ea5b1b9df54",
+                        "s" : "0x0e92bb08eccdc3e83672d5743d518fa6b3ce96cde226cf39b3b70e1a54e00924",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d618g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d618g0v0Filler.json
new file mode 100644
index 000000000..72b457348
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d618g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d618g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61026a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9a5a26296b21f767293ffa94cdc1c9b220fa067c3ed71a255293b5135943bbea",
+                        "s" : "0x1633570c68aa32bf360fd0a85867c55d4dedb9b516f8176ec583a365f3197f52",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d619g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d619g0v0Filler.json
new file mode 100644
index 000000000..d257e96ce
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d619g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d619g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61026b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd9c87b7373d3f386ffa06be11486b5e6676aec1ee389b813086542b386796a26",
+                        "s" : "0x3462736b3d44688b9ae06bea00739d7f91f36a3d7e36a39b6442c3d6f7894268",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d61g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d61g0v0Filler.json
new file mode 100644
index 000000000..62455719b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d61g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d61g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x603d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x604fab100dd5b77dd32d421046b2ab2c212360989fb026be0b7e31fd9fcd60b4",
+                        "s" : "0x0527ea114619cd423466260bded3555f56e201442f19471b0aadd5536f93825b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d620g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d620g0v0Filler.json
new file mode 100644
index 000000000..861d5df06
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d620g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d620g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61026c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x78da4ee7f8963d28233b5c122685bb1420e496f9609e971f7f6ccc2771d3bcea",
+                        "s" : "0x2bad94e47e67a8fca4a80d372fe15cb1e66211ca139a5dff2b1bb7498e91fb44",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d621g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d621g0v0Filler.json
new file mode 100644
index 000000000..4ca615936
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d621g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d621g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61026d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9a044551851c0452d31b122400a91c621644e1d96f54ec68dd1ac6f356776d1a",
+                        "s" : "0x2f0227364ee9c50a279d1817dfeddbcf8eee5e39eb563f092b580934e0d2227d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d622g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d622g0v0Filler.json
new file mode 100644
index 000000000..2ec23f173
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d622g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d622g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61026e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1fa6a7a3219704aa47620e2fe624ebba0214ca64e96d19b5ee10c8e0c35b16c9",
+                        "s" : "0x1be5bb768a1ab2e10648a6926c5ebcf6ac12672170953bf463f35d3c8060ea13",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d623g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d623g0v0Filler.json
new file mode 100644
index 000000000..e6758d0ef
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d623g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d623g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61026f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x496dc033ba90851dc59fed4138396a062f68e1247760f35d69996cfd06e1b150",
+                        "s" : "0x42055376db1abfdb15a3bee972cb02dd57c40b43b7d9ea2b88fbf8368e97bb8e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d624g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d624g0v0Filler.json
new file mode 100644
index 000000000..6f70e8856
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d624g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d624g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102706064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6606a11210948ac8ea2b8f7ee9f15c4705eda0265e2000d490596cfd5249633c",
+                        "s" : "0x4fe0fbf006f29f44fcb036422bc38cad91e7fa3f8fecaba2a8c45b9a87a85e5e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d625g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d625g0v0Filler.json
new file mode 100644
index 000000000..df9d4f7d8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d625g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d625g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102716064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd06521a2daf7495ec48377d3451b1b355401aea8fa7ac97de6dd375f0e9360cc",
+                        "s" : "0x11bb863ffe036f880df70d6dec4887d0aea4d534a6453573d5c1b3f61733f035",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d626g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d626g0v0Filler.json
new file mode 100644
index 000000000..fd574c72e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d626g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d626g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102726064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x043d79b8c959751f8011fe61729ef6d9cb74cff9c36101294ac65851fab24a0c",
+                        "s" : "0x06dd19eb00895a054e6aa6f272288ef21ff8f60118fcf1a46194338756d7795f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d627g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d627g0v0Filler.json
new file mode 100644
index 000000000..ea7c3aa63
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d627g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d627g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102736064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x991dfa0c4429cf784ed952a49367877def2b1ffba9116acd55e3a1a8b5934c09",
+                        "s" : "0x361c568d8c286fd7e91f7663840c47a0b2473492d07bb36bdc7b9ac4c1215c10",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d628g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d628g0v0Filler.json
new file mode 100644
index 000000000..04c9cf207
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d628g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d628g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102746064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x75b4d7db8dda7b96d6fa8698e6ad6fd5ecf3ec6edf48a38e5762aef889ffa299",
+                        "s" : "0x466b77f7588cdc286d6ab4624db18a39253e0af3085602c6f87ce30c452d3c18",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d629g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d629g0v0Filler.json
new file mode 100644
index 000000000..8703620fd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d629g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d629g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102756064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3193aa60ce566a36f05fc9c93dc80f3ba1fca371c160ae18391813a4c22dd8a1",
+                        "s" : "0x7e635ec26698828b30c3f8767dc1055ac3695ee5e22e4ebbbdf9a69e5cfcc6c5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d62g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d62g0v0Filler.json
new file mode 100644
index 000000000..b9abf6e67
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d62g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d62g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x603e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc6ca9c2f392d3c4337f2400840689c220fbf863abdacf453c4b98bbf850343d2",
+                        "s" : "0x4d25db3325cb07556266b959d977e54290fc9d5c220946916f21f6cd24f5f562",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d630g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d630g0v0Filler.json
new file mode 100644
index 000000000..87da3fcec
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d630g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d630g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102766064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4ee611cee7c69bd950f855ae37524b250fa895475852a2255b922f974689c696",
+                        "s" : "0x6ee0d3e91e84a9cdab8e13b97dc9425a057b9b7961cc829a7b0eab5c501f6f7a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d631g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d631g0v0Filler.json
new file mode 100644
index 000000000..756e46212
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d631g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d631g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102776064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6c9e52841434904f3b6fd331eed8125e3a2adf4aedf62a82a2a11c4eccb37a53",
+                        "s" : "0x0f7e75d703415c09205ead2bb71921868fee1eb82a405bb97c428fe49b6a5686",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d632g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d632g0v0Filler.json
new file mode 100644
index 000000000..3802ba0ab
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d632g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d632g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102786064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x34ef3d8893acfa006312636dfa7021bf7f549ab03d9ec85afb5b69fe7109faaf",
+                        "s" : "0x170ee75380e2d7a3cb26a43f7e46a917d2ebb19c9b38ec3d885873c2e74ce73a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d633g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d633g0v0Filler.json
new file mode 100644
index 000000000..957711231
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d633g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d633g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102796064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xda5364cabefe646903085f9c659f70b3dc37c47e560882745f975b9a1c00ac7f",
+                        "s" : "0x4d165bfcd4138f00bb09ae82ac3462bed37f65a791172362c03c6cc083d4ddc1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d634g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d634g0v0Filler.json
new file mode 100644
index 000000000..b501f7154
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d634g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d634g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61027a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x26bdcf8a853f9f9c0be37f5c1ebc8bb9dc1a050c32e1d034d23946102bada519",
+                        "s" : "0x74719f5eebb21b54a25a6cae1dca27e9704b60b8111b8c9727c05316285dfa81",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d635g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d635g0v0Filler.json
new file mode 100644
index 000000000..e16021622
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d635g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d635g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61027b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc5ab6ad2b556cab490e9edd81778f4d4de156f3034dc3995437fa7604ed12d0e",
+                        "s" : "0x270399ed2581e9d6cabc1bbc7c2632f6b3d82027ebe0246a6958f1445580097e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d636g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d636g0v0Filler.json
new file mode 100644
index 000000000..232f4b5d1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d636g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d636g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61027c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa6f7dce41adcdedd969e5d858e9155ba2655f1748b2e3da15f6b79829fce87f8",
+                        "s" : "0x63160b1c841ca0fdc19d13cc15bc5702401cc1dfad799e62ca8003bf2fee5d7d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d637g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d637g0v0Filler.json
new file mode 100644
index 000000000..cf732b2f6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d637g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d637g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61027d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7ff4804507f6d7adc174b8e5850a8c1d201cbfa9a2792b216d72360c622bea45",
+                        "s" : "0x4db69a9e68f316c852615aaca296b4e69310ad66e536f4717a0e61c99369faac",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d638g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d638g0v0Filler.json
new file mode 100644
index 000000000..edd42b62f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d638g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d638g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61027e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9ac39b6496f9212e9964b07aad95609ce4fc3b2586320cbdc088f48133e0e4bf",
+                        "s" : "0x501ec9e0a101d92ff3534d1dc9410308012799af20dd39e08dc411db1054ea05",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d639g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d639g0v0Filler.json
new file mode 100644
index 000000000..cde661991
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d639g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d639g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61027f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7fa3f471a78ab404761272ea2f7ce9e5ecb0964977d64ec9e756d81501efc717",
+                        "s" : "0x28c392df8e2b40511c88ef229444f25b882a725893e15101924c5326f56e9693",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d63g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d63g0v0Filler.json
new file mode 100644
index 000000000..2ad6a574e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d63g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d63g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x603f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0f6757aeb6f15f796567ece5e52ba99548714e9d71e828ce31363a0649bfd6e4",
+                        "s" : "0x26c8624784c76a79d78a1f703e390194d442732f41d513f5c077a24eb8428a3f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d640g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d640g0v0Filler.json
new file mode 100644
index 000000000..14e34a272
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d640g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d640g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102806064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x36b72a4d47d9ff5aefea3f4328ccf5d79425edd4d7c78a1e9b348e37c644cedf",
+                        "s" : "0x2ba80818b38976874446c962665167942f04a82ab79c6e630e467bff73c3e648",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d641g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d641g0v0Filler.json
new file mode 100644
index 000000000..f58c1e406
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d641g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d641g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102816064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfe2fba43b447b7888789eec67aeab2ea070e6dd44f9aa912c12404a44855b50a",
+                        "s" : "0x688b3b8166de88d0093b852c0c161764cbfe74de0b5e332684bd3c4c1f5c8e19",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d642g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d642g0v0Filler.json
new file mode 100644
index 000000000..182bd230f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d642g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d642g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102826064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfd7549af27a08b3446d3114cee299fbb9cbb27a7d6e37e0f7dd1ea1208933d13",
+                        "s" : "0x2d5b5b15c6ed0918109a21e1afc40086d11c5e355a48611afec99e5e690cf475",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d643g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d643g0v0Filler.json
new file mode 100644
index 000000000..587cd2d44
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d643g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d643g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102836064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa88a2811c39bacb962470dd965e27143d12a18a1b24466ab123c2de1121a7e9c",
+                        "s" : "0x78c6bd7eb6a7f94c7ad15b6898c37cbb5fcf2e5a8a8817512d5123352afa4297",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d644g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d644g0v0Filler.json
new file mode 100644
index 000000000..0146095a3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d644g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d644g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102846064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x53c45d602a660a9a761005ac549c73006f55c12d4a16c4deb7e54b6569416977",
+                        "s" : "0x0491f5f67be7f591918fb91d2f75ff34a5b7d7d960ec59f71e1011d75a5a9eb5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d645g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d645g0v0Filler.json
new file mode 100644
index 000000000..e9c93c08e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d645g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d645g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102856064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x03f6bbd0738f2957931e71d56fdb5cd473398cb0ec86921931e0482abb442d26",
+                        "s" : "0x1857777bf74e151b92ddcdf84591cd3d8549e6302e0d1e72be6079dc33c64813",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d646g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d646g0v0Filler.json
new file mode 100644
index 000000000..8900551c7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d646g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d646g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102866064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb3e25db7060e25793b27d6e928c2dd975f6874b578ce681c071a94d7dfc3064c",
+                        "s" : "0x141e5cbed0c82cc2a8b890fa8464e7f32ddd5a1869428fa2b795f4f21c7dc3bf",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d647g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d647g0v0Filler.json
new file mode 100644
index 000000000..491dafe1c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d647g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d647g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102876064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6e262a41184284640c2c88ae620b8ff2c39e277074d599209ff5bc54079dc0f5",
+                        "s" : "0x32e09c1e2c2b6703c4099ca9fcb3a4de73d8b0cb3d5b4f9fb44fdf62c4ed502f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d648g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d648g0v0Filler.json
new file mode 100644
index 000000000..f242d87dc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d648g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d648g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102886064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb96b0a4302905c1bcda5a8886d43a70aba39c14657b5d34ee6ac28fb4b54bc51",
+                        "s" : "0x39152ef4df7de1cfc57ef8677aa18a931941bf72f06c939fbee0cf21b2284371",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d649g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d649g0v0Filler.json
new file mode 100644
index 000000000..c8672f48c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d649g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d649g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102896064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1c9d6d3e42848f2aed39630038dcc7909035188b7488f3edb48fc3de27c21f6e",
+                        "s" : "0x1ad1e72a819f409f9c43cdb9cf6a337f16b90a34abf5c32a1f2640811f9e1f9e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d64g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d64g0v0Filler.json
new file mode 100644
index 000000000..fe15193ef
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d64g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d64g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60406064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x74643f847472bd55c7b29e8e841656b8a0512e8aae9b9911036c59e2d8752d43",
+                        "s" : "0x589f6e5e6cd633fcf0bd7312358f117b9351f23174e4f047d9447d0fc30f077c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d650g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d650g0v0Filler.json
new file mode 100644
index 000000000..5d4b9e15d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d650g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d650g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61028a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa645fdf29fa7c028ddc4630f198bb21223b1f8067311197e27f59b58ab174717",
+                        "s" : "0x22ed191f1f3d646f5d5865c1723d7996b42b77ff6f8fb46a72b7886af2293459",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d651g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d651g0v0Filler.json
new file mode 100644
index 000000000..98f8f9e31
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d651g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d651g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61028b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc415e7f83d845e6246a24a3ad3b5dbe1917b1cd5abc9077732cb3310df43336c",
+                        "s" : "0x309502e46d8f959b49b5be465f1849e1936b6ce1e9877b00c64cf0b73df8ef40",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d652g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d652g0v0Filler.json
new file mode 100644
index 000000000..9b641b952
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d652g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d652g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61028c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x408e638a6f2ce0ab554862d4a5a2d485764c41ee2161d100ef91193ab406cd84",
+                        "s" : "0x012760bb8afc0504b7a5b563405a81e1da7a33b2430b3ce63c71c3b7fdf1c12e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d653g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d653g0v0Filler.json
new file mode 100644
index 000000000..7268bbcbd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d653g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d653g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61028d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3407bafa5d72b43808cc7f4aa593405a4a322cc3e3ffa3efd461c4e4a6adc52e",
+                        "s" : "0x09adcf3d0debda7f2586100074e547778b2caf7a818d162b88d2917340b24f4e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d654g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d654g0v0Filler.json
new file mode 100644
index 000000000..92b1f92cb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d654g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d654g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61028e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6fb8404767f13c9f2bdccd3adf2ac0540c89a0b786926570c884e10d5ec23c9d",
+                        "s" : "0x49a36c242d9d18a259f5694a26f80344ad43d9654b3dd2566a44ecbb55c40c98",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d655g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d655g0v0Filler.json
new file mode 100644
index 000000000..534da7593
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d655g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d655g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61028f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1b2d0e22afe922973aadc0f870a5dad0ed9148fd7a257fd01da5e6dbb8a95527",
+                        "s" : "0x4cac00879954b3669b3a1d5d06c1fd5fb925c4d249e293f1f85652f196fe3531",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d656g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d656g0v0Filler.json
new file mode 100644
index 000000000..97cc05620
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d656g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d656g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102906064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcaebf4d2d9498a841eb1c73307d95958e68631de3f81d1a5ebe461d0a290d7d2",
+                        "s" : "0x1a2d7c7a8b98ad3f33ce684f6f0ac1d09ecd392b7f19b407f609cd1ac0641abc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d657g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d657g0v0Filler.json
new file mode 100644
index 000000000..c3aff4cb2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d657g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d657g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102916064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb48cb038f9a8d2ca7db71a625b7f3419d39db55d87ebcf4f0b9e3915e09d6b66",
+                        "s" : "0x4c6ed7c56ae491e804a9b30cc70806aa06242e5ccd28a634dcad73e7eb00de66",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d658g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d658g0v0Filler.json
new file mode 100644
index 000000000..7678a1693
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d658g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d658g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102926064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2af3c7173c6ed7bca068862289f329a2510907d9e5c1b43cff1130bcd7ce3865",
+                        "s" : "0x3f72745dfcc5fb5b0aa74974007bec57a1e1b40922347293e09606d283e26a8a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d659g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d659g0v0Filler.json
new file mode 100644
index 000000000..19fd72e13
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d659g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d659g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102936064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6f54c90901c7d6342e17cac1945426d4b0189f93010eb98bc93fdb002b0a42ab",
+                        "s" : "0x1cb6df3abf02366d87bba4bbb97e8f5073ac509dcf4988ce136e8fd1dd9d0dd3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d65g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d65g0v0Filler.json
new file mode 100644
index 000000000..d5e00e855
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d65g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d65g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60416064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5102a098fd4aadfc42c9664c131ce14fba73f00943dda04595af12573f40ff88",
+                        "s" : "0x574e371436e8ec364efc79c1e2c6e557b8f2aafb3342b1ea3c11403213bae26c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d660g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d660g0v0Filler.json
new file mode 100644
index 000000000..07921f700
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d660g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d660g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102946064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9e9d3cbca4a789f321a43dac4c085c2a9569f842c931d478ca6d0e91450d7e69",
+                        "s" : "0x67cfc5b5b38fb2c1c34f75ce5c35a9b2546b1a9b609751f58cc839f2956655fa",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d661g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d661g0v0Filler.json
new file mode 100644
index 000000000..069b75d2a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d661g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d661g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102956064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x11f0d82ce2c2c0167c1e0e0b5bf91e35a2ed0ee985703f7af97610e3dcb93fe0",
+                        "s" : "0x09aac32356501292562a16cf887d52b193561eb94fec1db89365c559ee30b96a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d662g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d662g0v0Filler.json
new file mode 100644
index 000000000..69843c15b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d662g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d662g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102966064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x31d7a7efc9fbaa08d86009c72d3a89fcd8e720ecff15fc8b3814ba5e1dede1e3",
+                        "s" : "0x445a0f686d74f79cc45435c4c07a27fc9d695c8c1fc403bcc2b4683c1c178301",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d663g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d663g0v0Filler.json
new file mode 100644
index 000000000..45a9373ed
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d663g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d663g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102976064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1d7fb0a66866de55a9138bdef8e88aa006db690aeec54b733dc28b24e3904f1f",
+                        "s" : "0x0b1fae45c0a151c6a912f1688597e5b51c556a0c4d70262b7f9ffb7f86171685",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d664g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d664g0v0Filler.json
new file mode 100644
index 000000000..5ee3363ff
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d664g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d664g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102986064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5d388cb4919ab17acd7c9ce1a01929e7f7425a3bb3348ce1f299a391ced44c9d",
+                        "s" : "0x253ac1591d5f7b953bc7a217cefd54c7e2ec709baad42933790e390973ce8614",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d665g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d665g0v0Filler.json
new file mode 100644
index 000000000..51aa7ba4a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d665g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d665g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102996064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xafeb6e1f756282c1dc7e677c6f022f63e90755e831c67b41974e4df6bf36d4e7",
+                        "s" : "0x7bc50ff697a94216566236fa6f4033941ad08cdf2a2d11ff4da9e6e3e83cdb12",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d666g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d666g0v0Filler.json
new file mode 100644
index 000000000..139c3fce0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d666g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d666g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61029a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbd1cb27a84dd48330f8f503bd620b0798e3cb362e0051b7ebc2c47481145306f",
+                        "s" : "0x5ede24dd7059daca73d44b320e8ad372854699c9e21e0d34c096bf11760c67c4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d667g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d667g0v0Filler.json
new file mode 100644
index 000000000..24ea5e561
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d667g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d667g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61029b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xce49da40583667433a795c61dd618636dff27e2850608f49fae8902645fc1def",
+                        "s" : "0x60700329b8aed13ccfe4430d25610799118e830b5e71367875af503890d77291",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d668g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d668g0v0Filler.json
new file mode 100644
index 000000000..d9bcb8da0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d668g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d668g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61029c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2ad3394e9422f68f26ddc586b24b62784aef19a5cffc5cc211545c4a1a9eebe1",
+                        "s" : "0x3cb7a1e25db068fac57da92898911df602c9d9eb3aab0b94a466984da8c3bd90",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d669g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d669g0v0Filler.json
new file mode 100644
index 000000000..e7f7b6a9a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d669g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d669g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61029d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x283c15750cd55e34ddb25f2fb22e9f9564eef943c11657e70e5fab9f4ff24309",
+                        "s" : "0x472aaa37d15808ab6e4409474f5d0fd01fc80f29c113807a9ed389bae4a6c9ee",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d66g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d66g0v0Filler.json
new file mode 100644
index 000000000..505a010ce
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d66g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d66g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60426064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x71773e9b305d1f5f2a49257ed22dac68c9af002bdecdf68aeca661c3b67a2525",
+                        "s" : "0x74a8810c98bd5c5eb02fdc328c537c72923774a7e3a0ad59c4a64b6f693fc85b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d670g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d670g0v0Filler.json
new file mode 100644
index 000000000..f8082bdd1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d670g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d670g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61029e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x38b95154a391a1b272b6ee23e58f2ca925ad0a9bb73009500785d7c87849cf4a",
+                        "s" : "0x4756329466c9507f033e0160d0598a645b676ea89f431d5cb0a88daa3cd1bfa9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d671g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d671g0v0Filler.json
new file mode 100644
index 000000000..798753a1e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d671g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d671g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61029f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9320e5ec6958aeb7b34dfd2b97b5dad72221fbb1321f7ccbef29ee6f40468a99",
+                        "s" : "0x404fbfa593dd0448ba2b593d6372af1288e2ad07e15fcbcdcf2c3c71c2496da8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d672g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d672g0v0Filler.json
new file mode 100644
index 000000000..24af09bc4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d672g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d672g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102a06064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc3e0188f65e6128cd3bfe4cb214090b34a6f443f2034b77daad4192895a4d836",
+                        "s" : "0x0d3b615d30ecc91395e6f72acab9adb2bde49840b1197e00e6642594e0dd15bf",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d673g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d673g0v0Filler.json
new file mode 100644
index 000000000..aa8fb8a98
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d673g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d673g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102a16064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb4c5a0e5e79b40e3d40fcdaa723bb903651995db63bf29888e240bcd35f0eaeb",
+                        "s" : "0x243324b69ce05db470c2df4ecc8b1c3eed4660fb185f5b6635f995b3d479ed6b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d674g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d674g0v0Filler.json
new file mode 100644
index 000000000..ea0aec7e7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d674g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d674g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102a26064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe6e8ced6b094e79a944e621b711e25bdb2c302270e1f98c546d2374f7e13c5c2",
+                        "s" : "0x2a4c5669f41bba872cf640cc00c86272b49e1ad03027e7e4b8627c1cf720304f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d675g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d675g0v0Filler.json
new file mode 100644
index 000000000..2ef9bb47a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d675g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d675g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102a36064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8e95f5da0dd79344752451692504fd0f5ba3bef6b689a07268e023bb333d1774",
+                        "s" : "0x17cd0932b218231d8c03ff9fd9eb0dd17bd2242d8fe20636a3dc937040db0901",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d676g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d676g0v0Filler.json
new file mode 100644
index 000000000..72134ced3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d676g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d676g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102a46064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc6b7aa066940be401f0f5075bd35c621dc06a921db343dedb47de25d646c6a81",
+                        "s" : "0x0eae41487b15d1d6a0455ca511ffa09a87149a159cfcc23cc1af6606c5ffc023",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d677g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d677g0v0Filler.json
new file mode 100644
index 000000000..6c2e5336b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d677g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d677g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102a56064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc7a165aa0e1f3f1674db3490f2da200d4e2267796d5a94234d64f5dcdd3519c1",
+                        "s" : "0x7c37c387826dd0c15bb37531544d0f97580a818f289b2d3d70893bf4bdfa9a65",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d678g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d678g0v0Filler.json
new file mode 100644
index 000000000..8bbdd08cd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d678g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d678g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102a66064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc2025a968a193deb60f5844c8573fb16bfc81f67be66d6f4b14c491882e3a5b4",
+                        "s" : "0x41c9dcd8933cce33d1bb24d976ac605bc271f710214c4a46b8840d18a19a689e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d679g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d679g0v0Filler.json
new file mode 100644
index 000000000..685dbb7b5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d679g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d679g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102a76064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd248e092e7fc6492acfaa69aa728031f8f8701e7840e1060a8187cde08a1ae96",
+                        "s" : "0x7f895faba022704181f495d22b4be7d98319cadb2439a62aa3a9292d7b7c8cc9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d67g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d67g0v0Filler.json
new file mode 100644
index 000000000..59b5194d1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d67g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d67g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60436064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x321a15c9bc920c2d1871774e01c3174e920864483c88f27b78c2434787a791b7",
+                        "s" : "0x2f0f796c920d5055b53f9d4929db12a7a9f000bd5f873bbc175af0d01d9e1475",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d680g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d680g0v0Filler.json
new file mode 100644
index 000000000..98929e7d3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d680g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d680g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102a86064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd296c760f87817d76b629f64111b5885c27c888e334e6d0466948e71c8dc32ff",
+                        "s" : "0x7182f1791d808dca57e3c6abd7c341da7205aa7591be9726ed8617bf1e8d1eef",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d681g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d681g0v0Filler.json
new file mode 100644
index 000000000..940c50403
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d681g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d681g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102a96064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9aa9a75a07b5ae99ebcf36fd85c111db0ffb24d592661e50ee652b0632430d5f",
+                        "s" : "0x24530a25b9bba1d06b28e2b7db547e750817cbdd0db9b14aa2d953571ee13597",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d682g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d682g0v0Filler.json
new file mode 100644
index 000000000..4f6e556d8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d682g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d682g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102aa6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x81768430b9dcede3bc5a5582be9b76e232fa8e2953e57a578f3f3e054b6dc0da",
+                        "s" : "0x7bd35447a70ee157370de3f5aff20e6573dbf4d7bfbce6271b439e7fa3150ec4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d683g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d683g0v0Filler.json
new file mode 100644
index 000000000..715a229f2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d683g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d683g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ab6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x46af3fd8aad7150c2d54c5cbbe4362f13007aa9ce7c9b9a2ea7719160780f0d7",
+                        "s" : "0x179f63f5f40ec4ab1e4bb857b95c476b124f872fd024ab30c56aa223c359c74b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d684g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d684g0v0Filler.json
new file mode 100644
index 000000000..48f7e7d7b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d684g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d684g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ac6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5e7ad9fbc2c642ae430b700656f4b3770b20dc6d316f1e2392604a7e26f24f6d",
+                        "s" : "0x40544ff781e6b7958e3cadec9d26bf3d1cee427837428b87bbef76a0a171ed73",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d685g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d685g0v0Filler.json
new file mode 100644
index 000000000..a8a8271d7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d685g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d685g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ad6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd752a1e92fb5b6d21852c87937612ed1028ab4874ae697bc19f83ec0affaf33e",
+                        "s" : "0x77346cae43129e61c3a268f881cd121fc065a8579d739c00914c619889c7b839",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d686g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d686g0v0Filler.json
new file mode 100644
index 000000000..48dd6b0f9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d686g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d686g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ae6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaf36b9e5692b3f730509e955db4a09512130643b5f5ba5c9ba7bdf76c449bf67",
+                        "s" : "0x13562641bafa6ea5e995e11ff35445e02cbba7596679a0ced728df1e184f9f1e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d687g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d687g0v0Filler.json
new file mode 100644
index 000000000..4ebc10b36
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d687g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d687g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102af6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x09934180ef50faae227575ea0764d7f733b11ef876b06cbc9746c99a657ae6fa",
+                        "s" : "0x39799d4acd0aae7abc2450537c228752b133c58f867a2f09e4feff3dbda6b118",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d688g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d688g0v0Filler.json
new file mode 100644
index 000000000..9136e4af6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d688g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d688g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102b06064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcfe61fb3dea3993c36218076b616f5ff5c1d8ee2b10fd10a17a94fbf6789835b",
+                        "s" : "0x4188490178b6953ad6468b7ccc8016ceb62e029c1fbf7fac00ffa034fd0eebba",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d689g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d689g0v0Filler.json
new file mode 100644
index 000000000..02d5d889c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d689g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d689g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102b16064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5d17a6f95637a655c2d18ca3125be984d3687442e42f980b987c68bc3772c6ad",
+                        "s" : "0x64a9a458eb2a8a6894bccd731128a9c32a90ae8636dd343824b8ae8692f807b0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d68g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d68g0v0Filler.json
new file mode 100644
index 000000000..9462e02e3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d68g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d68g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60446064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x61c9ae03f85b51cee6b9865f5f4e78a2e5d9be7f04549d9587ca247253290f47",
+                        "s" : "0x52dc87fccf7843ffa568d1c08e2a029c70782c9015c22f5ca94f0e25b637a279",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d690g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d690g0v0Filler.json
new file mode 100644
index 000000000..97c8debd6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d690g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d690g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102b26064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdeed8ac713e79862f4bdf72d2f06bb3f4670cff87cba28279bca9fb0e9a83ec4",
+                        "s" : "0x0ec2e1e308b6580a166cd81709e9ce0af80afd153d473b29eb0e9d0fe4f4b5f3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d691g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d691g0v0Filler.json
new file mode 100644
index 000000000..320ac279a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d691g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d691g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102b36064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc5aa87fc6574f8b4eed3e2be8c361c78c1546df45ba51d79c99c288a208e8d99",
+                        "s" : "0x4f11ed788c4406128352fe8256202b596fd0709f5c5337a003b2ce91fc8832f0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d692g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d692g0v0Filler.json
new file mode 100644
index 000000000..d68f0bedf
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d692g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d692g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102b46064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd1d02e31bd64169c93dbe77260bd3bd158821b77963a85c771714cc094792013",
+                        "s" : "0x61e18fb33f83c6ad2d7da117de90d78aa2dab3b5c9c87faee0d288c1e3cd8789",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d693g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d693g0v0Filler.json
new file mode 100644
index 000000000..0e8b646c9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d693g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d693g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102b56064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb6997f2605e7528317f54d976ac7d6a744e4a367fcb130cfc018cc01123b9bea",
+                        "s" : "0x1f17746530c2939a0c30b6baa81d97dc968fd31beb31a07b787c8b9eb44d311e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d694g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d694g0v0Filler.json
new file mode 100644
index 000000000..afe5c607d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d694g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d694g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102b66064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8ff5fa78542334bddcf8fdc60b8f09f71f1276601230b8b42216f0c3a291c5c2",
+                        "s" : "0x217905d6515b8fa95c8a02915f5b25c969ac68a89e37a9bc8097b8203e1d463f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d695g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d695g0v0Filler.json
new file mode 100644
index 000000000..617672e6e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d695g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d695g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102b76064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb9895f7ee5f004509d211c0927496991020823730b4306ecb375ea1bedaa6fb7",
+                        "s" : "0x0bc6ca3dca2fd63655ad1ce960a74ec52e0529cd7b8b4c2f82f342857044ec80",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d696g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d696g0v0Filler.json
new file mode 100644
index 000000000..7b0c8a8a2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d696g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d696g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102b86064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x40300a56412353d236b412040744487473c436b7cfb2a3d1aab0396dd0f10824",
+                        "s" : "0x7aa468d2cd116a24ab073b25352d08c9a1d85a915f85a445e8cc31856fbdc080",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d697g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d697g0v0Filler.json
new file mode 100644
index 000000000..51b7c7f24
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d697g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d697g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102b96064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x368b10bab3d903a2ba69ab434b34961c0849c843cd3b082ad01680df4b28ecab",
+                        "s" : "0x7ff0284d34926e60fcf913312ba283f02471c851d7ef20b924ff6bfaf2977b94",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d698g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d698g0v0Filler.json
new file mode 100644
index 000000000..df40516c2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d698g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d698g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ba6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe20a7c47193518dd01735654362d2b8e888641dff76a35c9fc81cf21f714c1d7",
+                        "s" : "0x7fb36f2c8eccd99b8ee0c5749e65181e6f63bba34ca35073cb103048d636e939",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d699g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d699g0v0Filler.json
new file mode 100644
index 000000000..50ab64283
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d699g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d699g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102bb6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf052b73079d3d01a0155d0d2280fc21fc15d80ae2ee7581c0d48aa89b0775970",
+                        "s" : "0x4a55b75b16355f8306a75a1f9979e924112e275f1e38721ae3c5eaa312c91cd3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d69g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d69g0v0Filler.json
new file mode 100644
index 000000000..c6712c3cc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d69g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d69g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60456064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xddc6d9fff8454f0d4d5658eae94c2ee6af01589c10fb358f25b4b0e73272faad",
+                        "s" : "0x62508989f25dd67983cf9d02fea02fd871a71feec0172ae1831887904ea61eb9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d6g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d6g0v0Filler.json
new file mode 100644
index 000000000..c2d6d519e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d6g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d6g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60066064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x19255bd03bd5fbd9831d6ba20a1b6722066156547901b3722559ba49c92682e9",
+                        "s" : "0x1b91b18d4bc17d2fcbb9491f49e2278680054b478a100cb5ce051d164e877e63",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d700g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d700g0v0Filler.json
new file mode 100644
index 000000000..c69cb2653
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d700g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d700g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102bc6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x213910b6f134c83f2b95d2e04198cc9c819116cdaac822402ed0753ca76889fd",
+                        "s" : "0x605c3b8c8970356ad1212513683889c7c6de1509a7be282dfcbd5147208974de",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d701g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d701g0v0Filler.json
new file mode 100644
index 000000000..d262f8512
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d701g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d701g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102bd6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x657ac640dc124e02a224ae13de10afbaffaf85e843ab63c727238ee11260cc2a",
+                        "s" : "0x1fbbc9f8c83fb779c43be967ade44a267b1586f32e778dc34cfd8d48ef7e42f2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d702g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d702g0v0Filler.json
new file mode 100644
index 000000000..9c14d8bf5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d702g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d702g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102be6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbe9403f0319694ad9dbbb80719dbc32192553dd990979c7c253f1f582996775f",
+                        "s" : "0x6589fd5cf82b152c7b32b78558948b72e83b3375ad9d6b90a30a61c18ca7c5c4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d703g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d703g0v0Filler.json
new file mode 100644
index 000000000..25c511e61
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d703g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d703g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102bf6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbb5ed192cd25a4a2852a1cca8d8edfb25b0069aa73c342e7dc8780d0acb192fc",
+                        "s" : "0x2899ac1d4d6d2d28c8202294d2608103acce37f51188380f3d5d43d492e9cb92",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d704g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d704g0v0Filler.json
new file mode 100644
index 000000000..5e6b34575
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d704g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d704g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102c06064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc0c00d346ef08db263b0c720d27a070e704e3cc352042066293a5247f9a3c6ff",
+                        "s" : "0x156aaa6907d915f46b85be750737839274233a407e6e0b220e47e606bb3c4eef",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d705g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d705g0v0Filler.json
new file mode 100644
index 000000000..f3354c1c4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d705g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d705g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102c16064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2e37228660b6c6043d165ba763a00e7109cf21c407de57fd993a474b94d91193",
+                        "s" : "0x17c9f7a218cf42311523caedeedb5ddf2fc9932a1fe47be712463974e94b11d3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d706g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d706g0v0Filler.json
new file mode 100644
index 000000000..dec5ac299
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d706g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d706g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102c26064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x69f1ec6ab33666d20819a7d351ea27fc08aeb12dc8ec3f21e7c7c50b127d58c7",
+                        "s" : "0x09e5e9e35e13fbc8e432fc7c091ab45a45e0a7256f7639fc8f2da8e4c58d339c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d707g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d707g0v0Filler.json
new file mode 100644
index 000000000..ee131d5b4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d707g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d707g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102c36064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc65114b1a50cb2c80626ea13ae47bca0cede8b13e205defe7d39874887a969de",
+                        "s" : "0x0c11fc07dcc1239a9c22c92794732853182c76c161689c2004e53c286de89a10",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d708g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d708g0v0Filler.json
new file mode 100644
index 000000000..7f92edc9e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d708g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d708g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102c46064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4b1f7e89048ea1a52ab84da29a14a9c1b6eb1c02ef64653e8114f40554133deb",
+                        "s" : "0x313a839a2bf35c95dbbd38737aad033b91bd53527079b3c430340ed4257dff71",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d709g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d709g0v0Filler.json
new file mode 100644
index 000000000..ed44210be
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d709g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d709g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102c56064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfa1fe30aeb399e77e239a02923b56bc8be4338e948016d45b751c8d7153a3265",
+                        "s" : "0x5650b0ce9ecd18dfade3930d6d96f688f0f87b0a001628c0af7e69dd4fa85552",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d70g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d70g0v0Filler.json
new file mode 100644
index 000000000..8f2dc40d3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d70g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d70g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60466064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfe7717f32a4ec7412c117abe0764fcd875040b6deeb2b4271fa2b7bfa199a3e6",
+                        "s" : "0x6cada37dccb489b0566c888d3be0a45b01976037a59a90344361dd8e28b54f83",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d710g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d710g0v0Filler.json
new file mode 100644
index 000000000..4e2eef7e3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d710g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d710g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102c66064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc3d6d4f6cff13d1c5c79928d4154f2acba90bae9e596d6fe1c2f22812a0ab279",
+                        "s" : "0x6205d0ecbb2d781207706ebb901a147b0de37affa13027fb54211b688e62a2b3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d711g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d711g0v0Filler.json
new file mode 100644
index 000000000..50201f453
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d711g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d711g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102c76064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe5fb79f06590c7a46e00ad7a2bebe03452543240450e32ffdbe26cc64fc5623a",
+                        "s" : "0x405b4c807428806dddd1c706130f5818a03a313de4229f84074fae4cdd2c798a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d712g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d712g0v0Filler.json
new file mode 100644
index 000000000..fbd63c50e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d712g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d712g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102c86064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2db369f64465f8f98b78f603e1b4c1a0a23c2750c3413a2e897b7e15e242243a",
+                        "s" : "0x2ffc38fe046efbd9c4e6bef4eea54dac4abe701f1dd196bf19b3773c4e71ea71",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d713g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d713g0v0Filler.json
new file mode 100644
index 000000000..62f1b3dfb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d713g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d713g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102c96064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3c8d1cf8d981ebe0c7a32dafeb02f09d815104c41d3d5d807aa5f7da4f9e9d86",
+                        "s" : "0x06569b68bdc5a2e62f25fbd30dbcbe36c25b8131abd875ae53358018c442f168",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d714g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d714g0v0Filler.json
new file mode 100644
index 000000000..a7d71b31a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d714g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d714g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ca6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xca63ea7236272274fee2339226da750e2fe3eac6d986f9d249b03f2f131e769e",
+                        "s" : "0x69e40085f96fe63cd9f990ad2cea9f2e5f0fd56df0672718fe592a6ef318e0f5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d715g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d715g0v0Filler.json
new file mode 100644
index 000000000..d5e4fa600
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d715g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d715g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102cb6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9bbdc4d39042e1460356e03acd376d762644ecb5a255df2df230c99add3998d6",
+                        "s" : "0x5649e9b66297b639c9bac9b2823c16907f2266c36aadb6e43b0975d840a233e2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d716g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d716g0v0Filler.json
new file mode 100644
index 000000000..fd4d2f77d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d716g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d716g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102cc6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5e06d196d9f88bf4e29b92a00aa2f61b5e62d6a366e77cefba17d7e312b713d3",
+                        "s" : "0x06a782fedbfd4103e45217a8ac753b2d6dc12f00833007908d99f2bdf6282628",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d717g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d717g0v0Filler.json
new file mode 100644
index 000000000..e3e7ed14d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d717g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d717g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102cd6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xccc00ed448f4f5c488b18d047cebb2375fbf3ac8293981726d0eee97489a1075",
+                        "s" : "0x01240e5a918f908d494c0b4f39ac8e2915afe4696237302b16868632fce29650",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d718g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d718g0v0Filler.json
new file mode 100644
index 000000000..46154fec3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d718g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d718g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ce6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x75377e72fc0fccd12425bdfbbed4bce28faa0414da58148e268d3a4a0f0b2f87",
+                        "s" : "0xabf56f0ef17a4fe0ad83fc2e9d33b46ab76f0d40be0f0059dba2aea51afcf5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d719g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d719g0v0Filler.json
new file mode 100644
index 000000000..e4592c6a7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d719g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d719g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102cf6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdea972efd2abff5e4da4afee539c45c7d9f915fb1a22d8c13dfd63341d988076",
+                        "s" : "0x3789e0c088bd1da51bf66bb2063df3c5f9708103cfc233f44789c62932bb81a0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d71g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d71g0v0Filler.json
new file mode 100644
index 000000000..2d3920074
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d71g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d71g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60476064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0feb36439c0ae71b438182512077db844f62429d7109d37a0a21fdfea9ecd30d",
+                        "s" : "0x660bc3bc5374918566675060f7e661bfb3020adb6cf66b75af4268c606d321fc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d720g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d720g0v0Filler.json
new file mode 100644
index 000000000..291025ab3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d720g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d720g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102d06064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4fa89b24f6aa1fe8d4a9020f240ca5c16f7436ef5b69f591e5ee5a47625bbb48",
+                        "s" : "0x51da32d8abbbfb1ecbce637b3dbd77063cdba241490c33893d584bdd1a3dd435",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d721g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d721g0v0Filler.json
new file mode 100644
index 000000000..5c9d01982
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d721g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d721g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102d16064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x75ffcec394caeb6312a53f87a77599a7a715793f193122b0952283c1c44d7d4f",
+                        "s" : "0x4136878357c9cfb5855e3edc01194df6d5f098e19177436b06d956cd28366096",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d722g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d722g0v0Filler.json
new file mode 100644
index 000000000..a353f6d74
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d722g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d722g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102d26064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x65338fc20abb01df49162845fa2850a980759bca35e07599688c0a8fbc2544a7",
+                        "s" : "0x564b13c0d908a88f28b2e430f590ea3c0ca036732ab906e7ada12b478cf5488e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d723g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d723g0v0Filler.json
new file mode 100644
index 000000000..ce108347f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d723g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d723g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102d36064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9a93f042e1c64c1b1bf83a905c5d702c46239e185ed7c0302a6282ba295ff547",
+                        "s" : "0x57663a9fed23a51cdd317e96449b5488f391cc5cc46b36062803bb44d916dd51",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d724g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d724g0v0Filler.json
new file mode 100644
index 000000000..33cb99f53
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d724g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d724g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102d46064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x60a9efd315f975b13fb73a2a0afa25e9376a3af8b8bcc2b62b757bc0ee62a5ec",
+                        "s" : "0x48130b3bcd7f2d24e9c94ddcc1d65fe9b88b41891c33e57cf1921cb2a4f24ec5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d725g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d725g0v0Filler.json
new file mode 100644
index 000000000..cda4dc57e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d725g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d725g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102d56064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa760263c5df91afa1d45202b5b9de19d68a43d82938c026a67864ddbd2a5fe04",
+                        "s" : "0x5131c48595c0597f76d47e6717994273df81e21ac9b460636007d09476d95d43",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d726g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d726g0v0Filler.json
new file mode 100644
index 000000000..835b1e7f6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d726g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d726g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102d66064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x86960587ae7646e092bf383abf05d6ab2b384c297459cb2f7d2aad64e877607c",
+                        "s" : "0x33799d36e8492cb07012dd5676a810a0a047a8d084e30fbcf5cd0e463fff5953",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d727g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d727g0v0Filler.json
new file mode 100644
index 000000000..a500626e3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d727g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d727g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102d76064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe1e566f35befa2d16f8bdf4054db2da702de4c84db44634a8864f5bbabb647e1",
+                        "s" : "0x110ba593f83b6af67e2a06fbb50f88facf67775efb5085e5d9d21105bbb19c47",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d728g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d728g0v0Filler.json
new file mode 100644
index 000000000..64d29dab2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d728g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d728g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102d86064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaf1405f25155132200b448640aef8d8a7221989a390a3f9e2848091bf0a2dd83",
+                        "s" : "0x2927c44c3199ca431c1a92872f66758f8e8cc37907788efe8abcde4c71fc7c01",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d729g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d729g0v0Filler.json
new file mode 100644
index 000000000..bcda3d3b4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d729g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d729g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102d96064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd2a5183de3c79c92f10398caceef425c0018cfbc50a234c6a5f444c368d280ca",
+                        "s" : "0x0cc647833e8136765c05bde1b53df4f0c95743f3b8b06fbf59646e053eab8ea0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d72g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d72g0v0Filler.json
new file mode 100644
index 000000000..73ea7bebf
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d72g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d72g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60486064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe42d2b6331f3228b5f1d2e6d37fa2ebf7ab2e2f12004def916df4303151c3f61",
+                        "s" : "0x089ef130470dc2d46f512325f35dd038ab72670f4403370a117fed36463e648b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d730g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d730g0v0Filler.json
new file mode 100644
index 000000000..580313310
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d730g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d730g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102da6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbd127fe174673ae96b2ba8f9cac8d1e383901a8d61a15c557f3a7afd8f9ae351",
+                        "s" : "0x270a43fa51e29be791a1bb9d2f9620c3e2ef6eb794e0394c115f0945421a4012",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d731g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d731g0v0Filler.json
new file mode 100644
index 000000000..952ad1c83
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d731g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d731g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102db6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x72e0c00f8614236b0355aad6fc81d1abb4084239c9af69d5b13a1fd6fbd0053f",
+                        "s" : "0x380aa4b9192e26d1c642dcec4576a40ce362402289c30d0ce704a4440769ff1b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d732g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d732g0v0Filler.json
new file mode 100644
index 000000000..cf4492620
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d732g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d732g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102dc6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd79d9df6e11b90b719239c5354a53c91356ba096295c750ace985dd3437afe71",
+                        "s" : "0x279daa89c5a4ac344cae5a2dd6da4276e1862836e127b4251dd188b324ca6a90",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d733g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d733g0v0Filler.json
new file mode 100644
index 000000000..08cdd0de9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d733g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d733g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102dd6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x99cc0ddad506d159e62d6335388956e809e2813cde478094c185c4ac9cbfcc0d",
+                        "s" : "0x345214a14561494289f83eda0f9d05f72bf2629cd095527ec63b9618dc024a89",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d734g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d734g0v0Filler.json
new file mode 100644
index 000000000..7ce62ed30
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d734g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d734g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102de6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x64bba0d6a6a029167a8d32908db9f398ca4a3ff8a20a922ecc4378898845f0e0",
+                        "s" : "0x26d00bc4fe19ac4b80b3a6a0c8831510e90bf000a39d54f4dddccd165fd36c8c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d735g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d735g0v0Filler.json
new file mode 100644
index 000000000..cda3fc420
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d735g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d735g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102df6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdf3c5263e969a6bf03bb24068869e4478b20ad7d14b4a647efa1e62e720eb0a3",
+                        "s" : "0x5bf5c66a9bc8aa6c6735475b1e71f0ca4925c1cf328e4d02916e7ae5edeb9a6e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d736g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d736g0v0Filler.json
new file mode 100644
index 000000000..f86d55914
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d736g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d736g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102e06064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5b5693d979ce1924cceb6cfc08af8d6040a9fa977ee8d0cc1cefb632cde86ccc",
+                        "s" : "0x4714973be84ad2728bde7242f3ea5e3ac99ebaa69a5a9d85bc23f797f3e7de1b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d737g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d737g0v0Filler.json
new file mode 100644
index 000000000..c15361ef7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d737g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d737g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102e16064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1dce896c7bfdebd5469013eca0e4ec60ca6e1953e5666bffbcdb1f730e0cd410",
+                        "s" : "0x336cf2058e0c60caf67eb957d2878c11427fa5374d0317359631099560e997c4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d738g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d738g0v0Filler.json
new file mode 100644
index 000000000..814be9c8d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d738g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d738g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102e26064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5c41e8d2b4273f397b66a16a066e5af5d59652d3bdfc986a794a6e2966496a07",
+                        "s" : "0x44c51b126d744d8a0bf192b9b1e0e4f27fc860e595537c48a2b9bdefd3c78121",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d739g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d739g0v0Filler.json
new file mode 100644
index 000000000..a5363b109
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d739g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d739g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102e36064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x39d487ba5f373cf440434c06aeff7c5d5fc225afedf435df0993e8304ecaf7ac",
+                        "s" : "0x3af56582a144c209371762335cf4897b6e61e76f43c7897f1379add42ac9a287",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d73g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d73g0v0Filler.json
new file mode 100644
index 000000000..c1045890a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d73g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d73g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60496064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0a7e27883094e8e0ff0db37db857693aa29abe87489e36ffab975629f29eaedc",
+                        "s" : "0x1c99931cb37b413458b9c3f292326705d3dee34a37bf6451fdbc368a3795de22",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d740g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d740g0v0Filler.json
new file mode 100644
index 000000000..18caac4b0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d740g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d740g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102e46064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x91fcf346fc8635ca1be11cb8519c4232a14da1079f8e9ea1c6befaeac0fff67d",
+                        "s" : "0x29ac12515540778af5b7ab2867ff91659fe2d978339fcbd9b916a0cce402698a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d741g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d741g0v0Filler.json
new file mode 100644
index 000000000..0a04b7579
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d741g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d741g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102e56064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x78e29962e2bb7ae250ef7dd5e68b44e2b1be34cc7eec9e3ae73ef5a55b7b436f",
+                        "s" : "0x79a8ddc3db2ddd367765ff88c155e54d9ac820e5cd9dddeb3736c7901c28dd05",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d742g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d742g0v0Filler.json
new file mode 100644
index 000000000..2a20f4c23
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d742g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d742g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102e66064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x37cbdaafdc21d0073c037b4e56c8eafa9c9baf14913bbd58200289ce0eba67e7",
+                        "s" : "0x41c463cf0dd7cff54c2144c728201e69717ba07f336425184d2792db628fb55b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d743g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d743g0v0Filler.json
new file mode 100644
index 000000000..5b6c60fe7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d743g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d743g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102e76064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa21e99a866b7b86037070421736ba1cd3b052cfcce963e36fda648056b408b9d",
+                        "s" : "0x31da7e3751718836431dadf9de6f537c35f1a51768e8f969a340f9a4e5ccdfe7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d744g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d744g0v0Filler.json
new file mode 100644
index 000000000..fd732d855
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d744g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d744g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102e86064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2ee0974e5ad2f96084404fbb44f66f5a7b6d8ae2ee321e1defc8b6ec60b1a6c9",
+                        "s" : "0x3a44a6ed878ec1611246391afa34514b24548e4b2d8f3e7daddd5fd7c4bef25c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d745g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d745g0v0Filler.json
new file mode 100644
index 000000000..154fd0b4c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d745g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d745g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102e96064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x02e928a5bf256391f4053174af9d08d5912e79dc7d1ff39cb7f86d5ce56b91b2",
+                        "s" : "0x3c003b357cc9656b31cf95d8ed7f89be5226f47ac3eaecaecf1c77011dd8876b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d746g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d746g0v0Filler.json
new file mode 100644
index 000000000..a216377d4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d746g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d746g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ea6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf62c8b62f879ac68a79e2686d00f278be766ec4522a43a6e317c760b7a25dae7",
+                        "s" : "0x6c302915efee9234a1f870289c68f2c684162653305bc8f68e6efeda414f3352",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d747g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d747g0v0Filler.json
new file mode 100644
index 000000000..65630a67b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d747g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d747g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102eb6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x51338a83c3e10826dd32e729182ab7532017b19af7798074385993b9f624ac",
+                        "s" : "0x492b53de46adbca7d8e7c8e6d946418fc93b866ef9e4ce60648b25593d32f0e6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d748g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d748g0v0Filler.json
new file mode 100644
index 000000000..c1e162ac9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d748g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d748g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ec6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x968a843eb317145e738462d7322cbcbf383187fd4638d96b04706bbbf2875055",
+                        "s" : "0x7163acd171e640931b3312deeaf9287ef108368d9ff0eb5b9c08085d400e5179",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d749g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d749g0v0Filler.json
new file mode 100644
index 000000000..ecc8cc612
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d749g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d749g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ed6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf69f24661e5a0057c9d73ebebfc9f325141e693285b31641756eccd34664bfb3",
+                        "s" : "0x6ac850c79f0628286e1f90637d7f506161266365c2f2fcdc33c8c6cdb9fda2d1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d74g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d74g0v0Filler.json
new file mode 100644
index 000000000..38a316fd2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d74g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d74g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x604a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x71739cc5ae371e4e8f19dab8bc57736a3b32a8078fcdfc0f3fb25a4ba88e5d96",
+                        "s" : "0x025245843565c3b9910df6e48730beb201e4b4b0e638d9c377dd222478150b29",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d750g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d750g0v0Filler.json
new file mode 100644
index 000000000..434fbb2db
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d750g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d750g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ee6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc84d89ef76eede686786d5038ca9b0510026a52122a40c29b6aa76ab54d0dd13",
+                        "s" : "0x22af8540b2e5b2297edbbba5f7bbcfd174f1c509f400ec9be0c5b0c24391b537",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d751g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d751g0v0Filler.json
new file mode 100644
index 000000000..78dd7cdcb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d751g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d751g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ef6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb0b2974d16738fb81ff3ca61a44aa6b69c675bcb1d730f56a35c67f09ce0dc7e",
+                        "s" : "0x399ad0c49fd1dd8ede6d79deb2f7a20ced69311d1f5644056bb1acb505963503",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d752g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d752g0v0Filler.json
new file mode 100644
index 000000000..9205154e2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d752g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d752g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102f06064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4da714804f3ee396756dcf573d8b2073ada000c6eaa2393551d288d5af1c5181",
+                        "s" : "0x4bdf72bd61d2d70898ad38cc67f7ce74357e8fb9496de1373a8de9ea303837b1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d753g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d753g0v0Filler.json
new file mode 100644
index 000000000..a62a44c75
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d753g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d753g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102f16064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x18e90f2e178fcb6628f3d42bb166c78b305212c9dbef1fafc0ec83d065c53fad",
+                        "s" : "0x02460de714ab2ef0b48179ee2fdd489b2d4e12385a8d86272a20b154297f2796",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d754g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d754g0v0Filler.json
new file mode 100644
index 000000000..65da0f1e1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d754g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d754g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102f26064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0daf2d3e339e65b8f3b568a36a5bfc86d3e370e74b99e1a6e52635a2f47688ed",
+                        "s" : "0x37d038748928a4e79cf9bdb9d660be282eeaa1cc4ce865e1911e8635a7809677",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d755g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d755g0v0Filler.json
new file mode 100644
index 000000000..32b3c76b1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d755g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d755g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102f36064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3006e8303810a5aedcc239a8f0140903f05d695e06d223b43a8c285947befe6d",
+                        "s" : "0x530078b77e9a42ab5b59f72b5d6622c469388a028bbcb75029921baac83fb230",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d756g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d756g0v0Filler.json
new file mode 100644
index 000000000..bbf066541
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d756g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d756g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102f46064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x358552d5fae4f2bce1de9f02e37695beee087a6eedbb4d8338ef0bd72c922316",
+                        "s" : "0x4f932e521ae72e30bf9d13e6576f3b30eca89f4e764158d871f1a5019ea1b98e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d757g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d757g0v0Filler.json
new file mode 100644
index 000000000..9229932b8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d757g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d757g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102f56064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0de8926b3d971f73f4c0752d1233746d668a37bbe98565cf420e379e38dd4140",
+                        "s" : "0x3e9a20690e73181032acd17d71934a3ea8688bf119bc4251f799edf6089a3ff5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d758g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d758g0v0Filler.json
new file mode 100644
index 000000000..94b413235
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d758g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d758g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102f66064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd2d9765accc3181aba244448af259e8274463ead708432c1320b31e58f20ecd9",
+                        "s" : "0xa7a511efd139f930e4d1134b09b9f949ff8c7e1e9d955c3f07dcf194e7a827",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d759g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d759g0v0Filler.json
new file mode 100644
index 000000000..5723a9c7e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d759g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d759g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102f76064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x32d8c556beae4cb6aa24f470a95c5b14fff2d5adc7339c7b2bcda7b011cb589b",
+                        "s" : "0x49376c02ccc8220816412ce89dc4f5a4dc8b24130320dd07f6701f6a3ce56868",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d75g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d75g0v0Filler.json
new file mode 100644
index 000000000..7e1942ce0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d75g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d75g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x604b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4bf440bd6800209b8e3039095c12b60074a2f40debad777e111312c8db6f5c0b",
+                        "s" : "0x630c9919058778eda315d128d852ffa9bb478fc40b794392eec72b6b0a973bf1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d760g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d760g0v0Filler.json
new file mode 100644
index 000000000..a63a728ad
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d760g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d760g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102f86064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xafe871250eb75ad1664f7c2f94a8ef59250de89c5abb54294b742778c69fc901",
+                        "s" : "0x15add6f682cef670ee88ee2f781c5dd7ce6ffc38a3fdf4981c2a9b8870a33cd8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d761g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d761g0v0Filler.json
new file mode 100644
index 000000000..5cd64f881
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d761g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d761g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102f96064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8cdc3c1caefc50c83c598efa4f9f88de2e63885846deb2efdd1d7d5fcd80196e",
+                        "s" : "0x077723c81f9393f2e3a5f963cda7c6d2769908cfbabbc3585aacce629974cceb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d762g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d762g0v0Filler.json
new file mode 100644
index 000000000..7cc9b340a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d762g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d762g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102fa6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdb67ad3e680ff69eb4a0a8bd65396a328f823135defbdb31a3875c0ae7fdb449",
+                        "s" : "0x6e560ac93cf9d6202b16fa6548aa505becdaf533f6d631b9259b9da49356776c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d763g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d763g0v0Filler.json
new file mode 100644
index 000000000..7581640b1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d763g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d763g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102fb6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x949a2833d8839ad82c23dab817f736d0ae9b160b8176c58965fd6fb0c1bda750",
+                        "s" : "0x687033637df577318ed89f5217f9105b783b0a624fb9b2485e628942eb02ca5e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d764g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d764g0v0Filler.json
new file mode 100644
index 000000000..029ac732e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d764g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d764g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102fc6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x189b490ec30ffc24d9c12da6cb01fe68bb7d40c1d66a6332b2668636aca93874",
+                        "s" : "0x7a9de041a498e57a37232668ce9076c0c08292e59385c055dc4cefe22e4a4d1d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d765g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d765g0v0Filler.json
new file mode 100644
index 000000000..8f393e421
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d765g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d765g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102fd6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe48d009a12b6e94630375104e10c3e2d63ab2f554f799ac0e8d9156205bba4dc",
+                        "s" : "0x5898057b4f9e2f895a9a50fcb0a747c6d809db7e819e7fcdf520291b85952cfe",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d766g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d766g0v0Filler.json
new file mode 100644
index 000000000..9427f7c0b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d766g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d766g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102fe6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x65c6753cbf6881ae621a049ddba6e7d13a69d82a8adf19fe6868c7b474a5cced",
+                        "s" : "0x35e2c89ec6096b3212adf5015592c3aa2f45086bedea8d4c3759946037a92fa1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d767g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d767g0v0Filler.json
new file mode 100644
index 000000000..bb3e203d8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d767g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d767g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ff6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x25990d606a1e3e158c54013de8f1521c0d41968cff346af2a92387f892045c0a",
+                        "s" : "0x07780d7597410805458447e7d4e32dcf48186b642e505ce0888fc3ee35187bc5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d768g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d768g0v0Filler.json
new file mode 100644
index 000000000..0ec68d7cd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d768g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d768g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103006064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2707b2f6927780e1092048a9f969a56383ae58fe5d226431a8c759848fd7fb3c",
+                        "s" : "0x24e32a015df5cf2d7f531229851eaef2eda907b5044f092696704f220420f13d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d769g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d769g0v0Filler.json
new file mode 100644
index 000000000..f6b7d55fe
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d769g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d769g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103016064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5dc1f3ef94159223ddbd826b77d46b56f7c60f8b60edd2b65c01d20cd63b20e5",
+                        "s" : "0x60cedf1bf32f2cf1d383143a4b9e188f6b37f7dd83c24d6c094037855360a4fb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d76g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d76g0v0Filler.json
new file mode 100644
index 000000000..102bdb542
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d76g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d76g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x604c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x044c01339fb9b6e2c39e7ab948e5d058ed3aadf5c7a38384a9f752a94d55ba39",
+                        "s" : "0x37677dc83e1591d5927a2faf2ce6bc13a45e5576bdd8fc8c3c936d3222d441bb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d770g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d770g0v0Filler.json
new file mode 100644
index 000000000..931fdf36f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d770g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d770g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103026064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x260b223b0e76700d7aef7d41c29c986c724e0d47e72e0c16430977ac4d8486a6",
+                        "s" : "0x3f56c5e1fe821d74057a30fcec99135fadd8d752aec0b44387355da963c441fd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d771g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d771g0v0Filler.json
new file mode 100644
index 000000000..b3f44dc77
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d771g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d771g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103036064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc631b5fed9761e95350b5c16313da443f3f5c91e7578a715bf9bd24f01276fe",
+                        "s" : "0x56f40de32bcd7512ada3fd3072b6d8fcc5a496dd9df2cd9a5b5ad315393e7024",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d772g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d772g0v0Filler.json
new file mode 100644
index 000000000..eeac9fc8b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d772g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d772g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103046064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb455cf8d3d6fbe2aeb9d4ce5494784d288fcedeb863f1510f211478912ff8dff",
+                        "s" : "0x18d2b60dde3adbb17e023020eca633ce5a5372f9f5fef249e461f29ab3d50967",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d773g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d773g0v0Filler.json
new file mode 100644
index 000000000..c708dd848
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d773g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d773g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103056064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeeacab88c707692de270f000569a9085acc85776cd44c914140dc1a24b6c686d",
+                        "s" : "0x10788400bfc8470983f67a8b50eaddb9c789ec820a63947044249a6fe375754f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d774g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d774g0v0Filler.json
new file mode 100644
index 000000000..c2904efa8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d774g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d774g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103066064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1c274ab570e136de3e93300491dd30c103d150770be6a11f70dc98dbcd137205",
+                        "s" : "0x257b7f941c9bbcb5f58eb7668c792e6b007cb3546410818e1b6ce255b40077d6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d775g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d775g0v0Filler.json
new file mode 100644
index 000000000..20c928818
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d775g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d775g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103076064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x713299a2a62e3d4cf51e6e479c624ec386ebf0a0398de2eb18a1880d87d4a213",
+                        "s" : "0x47c699e47a96e026d611f12f054981e586ad11e56ff34bec8e5918dfd8735e0e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d776g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d776g0v0Filler.json
new file mode 100644
index 000000000..dd5b0a819
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d776g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d776g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103086064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x444be2aab47185f3da4a7562fcfe4443d5226a129e9bdb2327207fcef560a08a",
+                        "s" : "0x54d2fa524327186c8ccf353178f0087434eede8f469999f5e0e856698e8d232a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d777g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d777g0v0Filler.json
new file mode 100644
index 000000000..0c2672a1a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d777g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d777g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103096064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x09b9ae7ab13022f1ac6ba4f9859a66846623bb96a5f20d017053d172d43916",
+                        "s" : "0x6c81afedcc351d1c357ec62a7be615f6da72ddcf652dd3150d5c5fa1246757af",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d778g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d778g0v0Filler.json
new file mode 100644
index 000000000..af5a4669d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d778g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d778g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61030a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf82dddc5204b4175eddcd3a21f4a6a23708048a1494645be5cb33454b3458022",
+                        "s" : "0x2ce8e20d762eafc31a2fce2c909606947fb1eb35948f291967cacc03f851bc46",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d779g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d779g0v0Filler.json
new file mode 100644
index 000000000..a8dd912fb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d779g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d779g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61030b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8cb4a09c3355b92c2fd4c526a779d6e1cc74e7f7dc8e8ef7b1ec12762392820f",
+                        "s" : "0x1ec81c0a4306a60725a6effdd52ccbf93a3466f6d97447396c21c95668604322",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d77g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d77g0v0Filler.json
new file mode 100644
index 000000000..6e929b6fc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d77g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d77g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x604d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x46242cb5868d17657fbe2e78bbc6ef95c049f162c5a170320755f07b911301a6",
+                        "s" : "0x1d98d2cece3debd6705cc63ed85ccbd5725e3e3a0e3f3f4e5c24902340b96501",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d780g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d780g0v0Filler.json
new file mode 100644
index 000000000..9e2046a93
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d780g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d780g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61030c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4530636e48ea2b07d4468b336fd32c1dc6870b468d631b363ff3f5a4916d0afa",
+                        "s" : "0x3ad1bc72c8cb4a6de2de2dc3ff153064ff70a8c07f88bd06050debbf1f60f568",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d781g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d781g0v0Filler.json
new file mode 100644
index 000000000..4c4f473ce
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d781g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d781g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61030d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3222e4f94df53d2f12a259ed2f7a076e2f7f49b8d94ed92ff8e82ff0ab171d2c",
+                        "s" : "0x5bb4d05167e4649e648ded062560c971f432f8eb36a1954be6d7ecc68a22b3a0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d782g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d782g0v0Filler.json
new file mode 100644
index 000000000..374755067
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d782g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d782g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61030e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd321a9325f2f9399561455d59f550e9023b5abb3183d4936ccb005d71b96ceaf",
+                        "s" : "0x3cabd8b3d5493764b0ecbaae9361e20847f7fdfa11272e46db35097b18386f1f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d783g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d783g0v0Filler.json
new file mode 100644
index 000000000..46e7f6173
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d783g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d783g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61030f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9cb96555aff4731776fad9678b8c999845b236db7bd1e279361d36cf219826ca",
+                        "s" : "0x20ed3118f8317a1c60ed33d7c34c2366e0d6fc26da728f43af684ec86b344783",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d784g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d784g0v0Filler.json
new file mode 100644
index 000000000..90fc19517
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d784g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d784g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103106064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x171e0d0457a15dc440d3685730fdf82c3e995062c63624d199ad1ea75efc4afa",
+                        "s" : "0x6307638cb9e51ddd257760f887bee07a9d38bfe780ad2396b4d12b3ee7949b75",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d785g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d785g0v0Filler.json
new file mode 100644
index 000000000..d0b856893
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d785g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d785g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103116064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7032e31c608a608833df79b882dbe7042c9e6de070bb04de7d7e67869268971d",
+                        "s" : "0x38a2ce5c6014b13a4895f598aff94dec92383d03ee09db08143f62d27470863c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d786g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d786g0v0Filler.json
new file mode 100644
index 000000000..04d2f5238
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d786g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d786g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103126064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5b39cf6aa047caaedfad59511f6758d28f46c03e7d39b8175f1fdf5525a5aea7",
+                        "s" : "0x13d21c4e8d243544f45a21556d3321f4c84ea85456767e089dba6b2d907bace8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d787g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d787g0v0Filler.json
new file mode 100644
index 000000000..cd3462d17
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d787g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d787g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103136064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcbdd596032aebecece852c165d354a053156db4c6caebe906eec5d9f4405ab3e",
+                        "s" : "0x24647cd41c5b1a3768b117ed8c109188fbd89fcdf1e5d0d43ad59b1d58953bb7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d788g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d788g0v0Filler.json
new file mode 100644
index 000000000..22a43a0ad
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d788g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d788g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103146064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc92c15cf552b317eb4b144828af5054e6b911270570d2bfbf6a0501939665241",
+                        "s" : "0x682f6b49af61e284b61faef22f3f5c432525058c66ff0008d44222e132e9c253",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d789g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d789g0v0Filler.json
new file mode 100644
index 000000000..201e66561
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d789g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d789g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103156064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa8cb68ee02dfca3175f5d5d5c4fd29e327156d092b076f60079c32907d6cdeba",
+                        "s" : "0x2f16ddde76697ccfc3d0787d6998d9e67e597f325112a4a7c8abaf87a19569f1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d78g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d78g0v0Filler.json
new file mode 100644
index 000000000..532a23e65
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d78g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d78g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x604e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd7ad56d127a82e6b2559e98ee62f299bf21ee3e3e325e069fc07ea732b5cd193",
+                        "s" : "0x0e0e8a6cea6d0ae0a3785472561ba212cb15ea88968ccfb3b9ed86cf9d8b6a02",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d790g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d790g0v0Filler.json
new file mode 100644
index 000000000..9e7764eda
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d790g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d790g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103166064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x409a6afc5bb7a6da7b563596f9e0237007b973b9dd88b0852bcc0dbf5bab3bcd",
+                        "s" : "0x248c0e8c8ed88212eab0da454392f9da835737d8aae9141da5ff864185da05f8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d791g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d791g0v0Filler.json
new file mode 100644
index 000000000..d4cbb9e3c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d791g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d791g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103176064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x425c4f64a0b5fcdfe4aa12c0613ab50f6f663944d365a79c01d749bdc118b9af",
+                        "s" : "0x67d656147b6000b605780fa0a3e85da3227b88529bb4d95c1ee2232c4fd1e577",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d792g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d792g0v0Filler.json
new file mode 100644
index 000000000..598f620ca
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d792g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d792g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103186064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x49a41e40f0b12e8f8eb62c6dae41d213be7c727ae32d3916dac21fd07da9fd60",
+                        "s" : "0x52a4d711e7eb588ab4025633af56a6f50ddfe8ed73defcd548ea3a904b84f604",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d793g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d793g0v0Filler.json
new file mode 100644
index 000000000..e4da7abbe
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d793g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d793g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103196064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xef29a62a82137d0d670f7198913504cf700f3cee7af50d42cbf9ee7e25fc27d2",
+                        "s" : "0x10e588aff0e452d1100b0432e08d831be28205acc31a5f361170e5cd2b2ef932",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d794g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d794g0v0Filler.json
new file mode 100644
index 000000000..20e9afb2d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d794g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d794g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61031a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf95d800bf5454781ac02ec7568955efae91bfc28b76b5ae78dbac670fe62fe0a",
+                        "s" : "0x974e32fc0b174186af22f70cbcef447ce4ea5e63f8e9cd0185b26da3bcbdc4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d795g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d795g0v0Filler.json
new file mode 100644
index 000000000..1b6fe385e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d795g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d795g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61031b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xecc1d9a867683e92ad97841bc7fb68ed7feefd5ed05a29f55e7c362a4cbfb32a",
+                        "s" : "0x6b69f4f7693c199ba29d042104bd2ee839082949d69a399ffb123209bc714c95",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d796g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d796g0v0Filler.json
new file mode 100644
index 000000000..7585f641b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d796g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d796g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61031c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7f12ac8e9f7bd076912de05ea54093fb30381f309f0eb5427591c9f074683634",
+                        "s" : "0x3eb1236f9d74b8b90fbe93ae0d1ac51bb55b13af116e6da9b5839c8502bc2ed8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d797g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d797g0v0Filler.json
new file mode 100644
index 000000000..dbc2dce6d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d797g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d797g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61031d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x948c3571c5fc20ac6e3e330b13fcf589aa4a1f5046aa44eb760f898eecf4b708",
+                        "s" : "0x78d75c6acc98e354c7091c2857e696e8bfa0fb3388c165fdf9b708b8f781f2c7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d798g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d798g0v0Filler.json
new file mode 100644
index 000000000..7e8ea132e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d798g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d798g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61031e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x37e1dd7185c6900a8a9a62d214ff7367177f8fce527b55a47afe54ae6973a65d",
+                        "s" : "0x4686a4a7ec325d017493131d833f3d3d93d2f0365a15e005cae76cee04dd8cab",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d799g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d799g0v0Filler.json
new file mode 100644
index 000000000..d12ac5e7f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d799g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d799g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61031f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3859a5765ce52f19a13d5c4d3a7904245a7671cef1d43b708ccde89b4cbd4a2a",
+                        "s" : "0x7ace060a9464e8a4ba287ffb333687687840a1dd716e208e7bc1e4302e13cdf6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d79g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d79g0v0Filler.json
new file mode 100644
index 000000000..757bfdb63
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d79g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d79g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x604f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x08ff0594bb22051cad2ee76f3054fe48a722a73d6a322af5e34d8c45eb5b4384",
+                        "s" : "0x58484c6722e1ffa83ba1fb5c282c0b2732131bd1afa3cc0b834e3832c405f6fd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d7g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d7g0v0Filler.json
new file mode 100644
index 000000000..e5c2edc24
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d7g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d7g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60076064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x55a4adbf4cd73395ac62ba0198b6a69556bf0fe119da5074808abe88dad3bed2",
+                        "s" : "0x6c926f24a361ef473994a69262e5cbb8f17df3651f1a1d60cd94f8243983a9e8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d800g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d800g0v0Filler.json
new file mode 100644
index 000000000..b51c3170a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d800g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d800g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103206064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x946e4edc457fbcd3264a72fde594949c3e7a1bb201408e46f0faa24e481b7a33",
+                        "s" : "0x5086175ffccf044ac7fbace3b4b3a0be78130ac878b6eefab832ef15993172db",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d801g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d801g0v0Filler.json
new file mode 100644
index 000000000..a4a874f21
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d801g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d801g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103216064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7f547dc8bd2e85a17b8abedb0497df440d6a6c1001739b80744745716d23ee7b",
+                        "s" : "0x4db5eec014328cf029c6863ae2f9de911699e262144ec15f3646a0f16f7915c5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d802g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d802g0v0Filler.json
new file mode 100644
index 000000000..34ae15b8a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d802g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d802g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103226064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x78b50feda76e46a3c27f31ac800660fc9458a99b354e89d71a614fa4577e18",
+                        "s" : "0x7cb840c219964427176fbbb70f35884d9281fca415fed3ef951c34b87b2d11a2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d803g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d803g0v0Filler.json
new file mode 100644
index 000000000..d056eece3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d803g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d803g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103236064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6f67eab11165cdd523909b8f0d846a65b7392fd79980a24ec193346ba128619e",
+                        "s" : "0x6ba1794053647136c9b35cfcff88c5b7267bf1725d1bf495398a74a8ecc3d1b5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d804g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d804g0v0Filler.json
new file mode 100644
index 000000000..d25021575
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d804g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d804g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103246064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeb95fd1353b54b27dc5cf2461f3e46627c27c3d5f9619604d68e74ee4b5aa492",
+                        "s" : "0x67fe5d66273d4b9f4b6eeb873cebb17f38f9a744732f7bb2188b930d306d08d6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d805g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d805g0v0Filler.json
new file mode 100644
index 000000000..3a4693bea
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d805g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d805g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103256064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf6d7b4b3410133a6e689ef3385e23307a42d2573892cdf0639a309f1ab35cb2f",
+                        "s" : "0x59c753defb3b6a34ac8c52b5ce536c432d528c7a512dab1900261112c85e1112",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d806g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d806g0v0Filler.json
new file mode 100644
index 000000000..73a337564
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d806g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d806g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103266064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x48a02eb52d51ef4ddc5d61ef3923e0f11e99f3482c0a1e62e1aa257f85bf14ca",
+                        "s" : "0x08a981ee3f24018d24b8d5c5ee8dee417b9aa5110791b17752604dfe60b87df4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d807g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d807g0v0Filler.json
new file mode 100644
index 000000000..18fe5ffba
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d807g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d807g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103276064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8218c0b8de4025030e2bb440816f89ca9c4f971fccaa550c6ac18d6830c74317",
+                        "s" : "0x6cec988409ce5abdae0cf0224383be954940f8c13cb2a565227b417c784581e2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d808g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d808g0v0Filler.json
new file mode 100644
index 000000000..db8cd9f96
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d808g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d808g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103286064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x089f6230f013eef28ed89f216f3a012be4e2ffd2874fcae56da5fb4fa1b98d7e",
+                        "s" : "0x0f3c67fa966ecfe2eed9e521715e291181c46ee585337f30633e3cb641797072",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d809g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d809g0v0Filler.json
new file mode 100644
index 000000000..60cb96f57
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d809g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d809g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103296064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9554d0306d69ec19efb99369b46ad5af8f11c5042909798eec957857b2acbfa9",
+                        "s" : "0x3e4c8b718014fa57f110816c7c8da5519c73606ae5d01686d12298046ad3cd98",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d80g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d80g0v0Filler.json
new file mode 100644
index 000000000..66c5a87f6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d80g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d80g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60506064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xac624fe95974676950f741981f09c8ad0104bfc81fb8fb8011b197b6c6c33766",
+                        "s" : "0x1e86c7c01ede57f8fe7a2cad38d2f626588e5af1bc7772eb542346da19cb285b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d810g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d810g0v0Filler.json
new file mode 100644
index 000000000..8fe517976
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d810g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d810g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61032a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd746f8b113c0c83ed2feb88f8389b89dc001f5658eb2e3d02321297ef00f87c3",
+                        "s" : "0x63b9eae6f2207420a1b321ff2cb77892797c6fb678f53981cb54a214995dc119",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d811g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d811g0v0Filler.json
new file mode 100644
index 000000000..588fe5969
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d811g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d811g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61032b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x321dd1368d10d5d44276f3d2972783c10d40d03eee4171583cc914afe4cca6b6",
+                        "s" : "0x476aaee890a353e8867807c788ede95d7baf5ca0f9f2480914fc396c3767e65c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d812g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d812g0v0Filler.json
new file mode 100644
index 000000000..5414a8b4c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d812g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d812g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61032c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0cf08efe22997c489ac25ef3715475b73cd3c547113afaf6c634b25cd9cd75be",
+                        "s" : "0x13cda5579f3936b4f04548064f89eb616c517cd0d3bef0e6e891665cc7e6935f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d813g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d813g0v0Filler.json
new file mode 100644
index 000000000..aa9aeef0e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d813g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d813g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61032d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe754159b445d00724d1c54e2b022f94df21ed05a6946f9253cd2ce69af14757b",
+                        "s" : "0x6783b6e23b87fd9dedc219a9ef811b6dae58f874dac9f3d7b7a1a118feabfe56",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d814g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d814g0v0Filler.json
new file mode 100644
index 000000000..4166661fe
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d814g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d814g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61032e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xffbff92d2158abc6ea556ae6153f1d9c1cb79719944dc6b942a1f731096dd8aa",
+                        "s" : "0x065682e7d6661c152a088a52a2688f4edcfd96d400ebb3cb22e0eb3c5f496381",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d815g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d815g0v0Filler.json
new file mode 100644
index 000000000..2b982ea95
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d815g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d815g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61032f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x54349887ea6930ad5dc0cd9d81ec79545a66d5ab311cbd6d0fc43516f871f554",
+                        "s" : "0x64d111cd457281eea909a22387750f2fc3df379dc21c9869fa563b4cf7e46ad8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d816g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d816g0v0Filler.json
new file mode 100644
index 000000000..7fe204794
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d816g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d816g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103306064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdbd29e71a290e2c350dacbbb97a82355ce676c1fde0c7e0117648916679bd9d9",
+                        "s" : "0x697d29486fc6bb984b0d9a6662d4c5542312e8330b13dd619a582e6ce154c8d5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d817g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d817g0v0Filler.json
new file mode 100644
index 000000000..85238ce94
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d817g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d817g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103316064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0c43506cea7ee4d8f0ffbe61cf80a20e56fa64a5e6aa5f1e84f20bc3dd1713d8",
+                        "s" : "0x1b5013b5cafc05bc295b22735603a6f97301a91f1138b1499887e38b360cdf70",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d818g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d818g0v0Filler.json
new file mode 100644
index 000000000..ed09c32a5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d818g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d818g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103326064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfdb49c18bf54f377877cbea7f13769b2fa4a0d7e46ac31516083c18eeedf6b05",
+                        "s" : "0x0aeaa05dd81fe7ecd47151af7f23cde88647c3e1c49579d4b2c8f783d1e62109",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d819g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d819g0v0Filler.json
new file mode 100644
index 000000000..663ad87c8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d819g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d819g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103336064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6dfa90b13173058b6f23dd38a3a16a3aa48b44613a5ec62134130b464b4c1351",
+                        "s" : "0x6e81a36b80a0c0d466f3ba3578f3976a47f0b921f8ad4fa8689a310c2a8b8f0c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d81g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d81g0v0Filler.json
new file mode 100644
index 000000000..f9bf83be9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d81g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d81g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60516064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0cba22b6252c61a8d65dfdb28420a24e36b7262ecbb3bd383a4f9cd3a86854cc",
+                        "s" : "0x2391c0ac55b56542d9536347a34122c32b6bc7043829987cd4869bf894d39dec",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d820g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d820g0v0Filler.json
new file mode 100644
index 000000000..60f7c2521
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d820g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d820g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103346064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x569967822b219800f5f79aeb8f706b7fbd6145af1d7ff28356c5aaa33ca7d13f",
+                        "s" : "0x51dfc0bee962ab083ba299ce80cfa925b2c70ba49fff73be899f09c845ce4cd4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d821g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d821g0v0Filler.json
new file mode 100644
index 000000000..b6cc0a88e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d821g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d821g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103356064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfe5f39a8965e2019269362ed7b5e0294b16b5902469b647cbcc4209ec33730bb",
+                        "s" : "0x49510ce6a279e6c68c13655b5bd4061acf6c38aa4744b9d94d702a0026153696",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d822g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d822g0v0Filler.json
new file mode 100644
index 000000000..9ff6fb319
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d822g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d822g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103366064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xad83cef088f46633ee367d7371643306c224b6ade034bcf36085d1a9c1d5756c",
+                        "s" : "0x5753d06d4d6375f814741f24b1f867415d87c2298251ade1a3c5f0be2544fb9f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d823g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d823g0v0Filler.json
new file mode 100644
index 000000000..ffe78129b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d823g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d823g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103376064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x60024655b1b5b8dd9b9555bb94b8e225090da3df60294946476848ce6b3a38f0",
+                        "s" : "0x51e3e05c3ec2dfb81327a17715ba5fbfb937d481910cf3604c69b3d40e90a4a5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d824g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d824g0v0Filler.json
new file mode 100644
index 000000000..3f1e7307c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d824g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d824g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103386064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x127d7c863c67e83c38c7f25a527dab3e25af1f211e367b886b8a44328002a4b2",
+                        "s" : "0x3fb3d370543a7aa4e3c28868d8173d7865d62a6b517c41c7c7025f46400fd39e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d825g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d825g0v0Filler.json
new file mode 100644
index 000000000..a6aaac300
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d825g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d825g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103396064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe5aa318195ec921822a5cb62415a0353f3e0017f8e80956d10daff7c46d95da7",
+                        "s" : "0x23f9c2d5166d4c7a88305168bcf7a4ad43040ead7dd006e696536e9105e96ca1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d826g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d826g0v0Filler.json
new file mode 100644
index 000000000..4c88e156a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d826g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d826g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61033a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa00dd5f8185858784c075c00ae309a89de91cd9ea434bcdb962a91c8621e7f29",
+                        "s" : "0x314620ae6cd05ac1521a3427f58ab6429c7c39b07cef2b89bcda68fdabadeb6b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d827g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d827g0v0Filler.json
new file mode 100644
index 000000000..aab896845
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d827g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d827g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61033b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb0621a7d6aaba849cfcd3fa461900f115d40942bbcb53e7f97914342ff3a7a10",
+                        "s" : "0x7f5d1718525478474dcd52ea32b4413acc3260c2d6b6efe6ffa96c029a72d21e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d828g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d828g0v0Filler.json
new file mode 100644
index 000000000..59c792f46
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d828g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d828g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61033c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8032079df5880e5fdb92349a3d8b4ff2ec4db9bc4c945811b4110a3309f82582",
+                        "s" : "0x42dbd147b2eb702d0030c02032fde0f4e43aa09f0594f0b635cca1bfa24c6aa7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d829g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d829g0v0Filler.json
new file mode 100644
index 000000000..287cac179
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d829g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d829g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61033d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xec56c282546d23bbe359a0a4fdda8f2d2f2dcf8f86bfb0d6c88aede47af7b68f",
+                        "s" : "0x7f7525c1ad53d643c282f9a3ff6368ff23d0fd2ef45a763a1c897ecf44dd576d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d82g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d82g0v0Filler.json
new file mode 100644
index 000000000..f3470b646
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d82g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d82g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60526064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa7ca896401093840f0f982c5ce7c34443b8ce11d424604362ce3de45c87620b6",
+                        "s" : "0x6d5d35e2ad75d1f96dcd85f3991eafb5fbd2644fc11300278b2e636ea9ae88ef",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d830g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d830g0v0Filler.json
new file mode 100644
index 000000000..36d7033bd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d830g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d830g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61033e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8bfddcba63088dd259564731bba605859abf1fe7c37eb1ead096136f930ed3d8",
+                        "s" : "0x70bf9a626391ec452bc6e699744c77c7ef3c83dee9c3e707e95d09c49295c0e8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d831g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d831g0v0Filler.json
new file mode 100644
index 000000000..55d486c17
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d831g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d831g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61033f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb16b23b252c3097c8e080ab031c24dca7da6354d2b22c9c705eb0d1ef9004ea9",
+                        "s" : "0x105ff49b412207331036e986127a690b34d8f1a040e6bccf2ac9de46962bdeae",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d832g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d832g0v0Filler.json
new file mode 100644
index 000000000..30477e065
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d832g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d832g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103406064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x878c596e948799221835dd115119133e9e1b26aae9187c28ce34ad40266e692e",
+                        "s" : "0x77cd3843506438b320acfbfac7b19bbc507d14d22027a440596ab93adf579e65",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d833g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d833g0v0Filler.json
new file mode 100644
index 000000000..670c79841
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d833g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d833g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103416064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x40a60af79c18c4c23b08542dfe8dcf822adad221b527169a8f3404dd5e6902f6",
+                        "s" : "0x7d6c06d89c5b5a9e478fb7c1ff9ba214d8677e4aa287b373be58f500f91a2e9e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d834g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d834g0v0Filler.json
new file mode 100644
index 000000000..f4025cedb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d834g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d834g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103426064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x01cef141eedd0ea86d4468550431558ec2b4882c94fbcc22138677de7a1c762a",
+                        "s" : "0x2e62ec18b72b837d99b1c4202b8e08db76c09af6ae7199a0be1c91d295d79604",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d835g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d835g0v0Filler.json
new file mode 100644
index 000000000..1fe867db7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d835g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d835g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103436064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x611225786a8109dfde55fc56040b254c3c175a36aba8c1435cbc64d3d0f677b0",
+                        "s" : "0x5ba75235694238e580a5864af72450aa31c22d0576bca25bfaac68eabe3982c2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d836g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d836g0v0Filler.json
new file mode 100644
index 000000000..442a962df
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d836g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d836g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103446064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2e40742156476517560f81d9bc54da0d6b44734d0cd1a19f68edd0513b4e7c45",
+                        "s" : "0x335d01119535166596b50e0746f61ed39f3897802d6db44fc0146e2787bc5d7f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d837g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d837g0v0Filler.json
new file mode 100644
index 000000000..bf8e11943
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d837g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d837g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103456064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x57fab937047e2ed42d1e398d63fba3f73ac37d098c09ea14d3777dc9e011260e",
+                        "s" : "0x0d8f2723d62c1d31d16144fcd206c8d040cbe21c7d80657b7682949186791591",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d838g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d838g0v0Filler.json
new file mode 100644
index 000000000..31b9c58dc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d838g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d838g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103466064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd568477a99e4705fc7e5a9c57c985e3e36b9f39305c3fabbfaad1c82f71ae55c",
+                        "s" : "0x7ea3313f2a02fee9f4498a7a94a9ec5baf38a7cefe2a26aee2b369916c56c16f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d839g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d839g0v0Filler.json
new file mode 100644
index 000000000..2e685e203
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d839g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d839g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103476064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xce398930cb7680c1c040e56a2dbb31227617c69d7c1e3980a21c219cee2e3157",
+                        "s" : "0x67fd9535acc6e19de3135896459615d7058234206ee43c4c0cce03ae0aa54176",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d83g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d83g0v0Filler.json
new file mode 100644
index 000000000..11490388d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d83g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d83g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60536064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa5888e93d458a69dfc9133c7b6966090bd642ea0a50004a270ab19b01d533074",
+                        "s" : "0x200987ba9236e7b9b31c147ba3f6c19e01e32a140d8a18e8aa2ea590c31d0553",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d840g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d840g0v0Filler.json
new file mode 100644
index 000000000..f9652467b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d840g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d840g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103486064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xebc6aac6d32bd64d368d3586ede01608d051dcedcc1a753d2238bc37bdc5e793",
+                        "s" : "0x64ec05daa642eac5ddb5c8c0e2b6a2554f5da168713f46771d31f6cbc662405f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d841g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d841g0v0Filler.json
new file mode 100644
index 000000000..eed0210ad
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d841g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d841g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103496064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcd9545c8627f26eaec6f8ff37a6cb6c98286ec9d78300a43839c60e6d6becd45",
+                        "s" : "0x6ea1216a4263fb948fe4ea1fd329a1b4ce587f4cbcc4f09f9119f40ae26fa2c3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d842g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d842g0v0Filler.json
new file mode 100644
index 000000000..eaeadb380
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d842g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d842g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61034a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xef8fcf1b5fd72bbec528990db38a269826f77ce6366e097f93735b0844b595e0",
+                        "s" : "0x43c0dc8b3ea2891da47ec38e0136a31f63f8be46ba2df3a9e05c340471f7ef27",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d843g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d843g0v0Filler.json
new file mode 100644
index 000000000..14ff41f6b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d843g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d843g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61034b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcce230a4306975ff41237fa56bd3f54acbc9630ef6b72ef7f9484121b8443b21",
+                        "s" : "0x3f4948732795392964c0e9953cac5cbef8358441b15ce4047cf85abd96261256",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d844g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d844g0v0Filler.json
new file mode 100644
index 000000000..0acfef3db
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d844g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d844g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61034c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd9f113657e410e2117d72b570ff26b6ef5a7984c0f2a2cf98ce3fba766218d89",
+                        "s" : "0x25ff1bcf4b9236307ae7d55d2d0ff0d813a384d83bb8e645b52fe105fe5b6a0b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d845g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d845g0v0Filler.json
new file mode 100644
index 000000000..684ebfb89
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d845g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d845g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61034d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd00e140bb9cbe88bab8984a231d14f7dca09a00965ab5aa0463b62c23d9f9819",
+                        "s" : "0x37fd68d05a607e0fd0d4dee0a2e78ec65a5e21cfa6c2e521e39dda988c3b40a7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d846g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d846g0v0Filler.json
new file mode 100644
index 000000000..a2aa10631
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d846g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d846g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61034e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0cb6aba4adfa70ba5fe2c085df80a6c4bf5a738b8f4e05faa77f63ae3d081964",
+                        "s" : "0x27c499e2edbe9384c1c089ab5a473ba5ebe8d652905e22d550d73a935bc29e27",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d847g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d847g0v0Filler.json
new file mode 100644
index 000000000..71c922c99
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d847g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d847g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61034f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeff83971980ff0937964dc3e92ca33544905290f9e5a2a0265f7db3ccb047111",
+                        "s" : "0x405bd3c6d9971438b118660127b747e2a8de81b5b5459d988b2f8dfd18b4d057",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d848g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d848g0v0Filler.json
new file mode 100644
index 000000000..d1ced1535
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d848g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d848g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103506064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x12ee516b932ec3c5933ba4d100aa30310b4c581a466784da96a065a503b84b7e",
+                        "s" : "0x5413e37165592371808dac0a84f768c303d10e61f2ce3b065b96a912a07dde17",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d849g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d849g0v0Filler.json
new file mode 100644
index 000000000..229156f05
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d849g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d849g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103516064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x29b9c675651d10761d8d00907cbd709b3b29d23130dedafc9a282699d8bf5d11",
+                        "s" : "0x26ef82c6b221a2c2a377e5d80b1187e9930efb0c9b1b363ff42ece525e201a5f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d84g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d84g0v0Filler.json
new file mode 100644
index 000000000..6a6ebb1c7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d84g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d84g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60546064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfae8b234e30aa0c8c7a85080b747244e901ce7571d468dc03933eff054d8f4e2",
+                        "s" : "0x6892ac4e9a1a33c36a3a3b1e8ee3dfea39394719ec74a4f95a47139c1d9e61a7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d850g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d850g0v0Filler.json
new file mode 100644
index 000000000..efbef9f54
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d850g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d850g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103526064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7548d48b3ff17e446940bf52b575e9154301e8e716de95e9d40106b5e9f51d30",
+                        "s" : "0x0e68b3025b6664c58ea342b3015d01b584676e75cccb6fc8e53d4daacdcf22ac",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d851g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d851g0v0Filler.json
new file mode 100644
index 000000000..fcbbafa72
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d851g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d851g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103536064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x83485f0ee2fc5b0c36daa76ba7c237702b3938d5f32403844ad1aef6a86f0c58",
+                        "s" : "0x331a5f8d07d8c31da740346281e4356c419c3520c6d1eef7b7754f5e050c315f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d852g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d852g0v0Filler.json
new file mode 100644
index 000000000..cef57901b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d852g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d852g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103546064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcdfef66a1d6ecc4692786fa0f683a96199a81e423224c859a0a90d7f59ec02f7",
+                        "s" : "0x3916ae0359cf61ba4d956ab1120a865be99251ba4c5a653d264246832e6025a8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d853g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d853g0v0Filler.json
new file mode 100644
index 000000000..f6f970452
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d853g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d853g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103556064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x779c6da53b9827306198a66019ef47ce1cb5cf04383c29b6d8b1220ad8ec827a",
+                        "s" : "0x62288bcab6ab38eb14b4888d00410f6fa04d77770e42208a1741578d5a79f642",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d854g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d854g0v0Filler.json
new file mode 100644
index 000000000..7b13d0da3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d854g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d854g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103566064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8779017969c8647776dedb49457d72b80e53988790a78d182ff39af2ab49c684",
+                        "s" : "0x2ddfbfa5520d5e9a1504076d1df29911543c29a952a84ab17fbc5b7d4b8e536d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d855g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d855g0v0Filler.json
new file mode 100644
index 000000000..e6f7ff920
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d855g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d855g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103576064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdd318ff20d1628a2071b578fb7484e8f31908df0e14803fb1dd1fbb07285e5b8",
+                        "s" : "0x6d2575a7acc6a6455dd8a58c40e2ee8f0b752564418e35fdcc738aa441977645",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d856g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d856g0v0Filler.json
new file mode 100644
index 000000000..28f4d9b16
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d856g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d856g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103586064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x628a3e505d7fec67840fac627e85687cea76fb6a3ad997a2186e52940615b0a0",
+                        "s" : "0x0d3c877e4c7a66f1d728048ad840cf4fdddc26ac19be982a100d934348d1d474",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d857g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d857g0v0Filler.json
new file mode 100644
index 000000000..0bc8f7fc0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d857g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d857g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103596064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa723286625a3587b05022fe8c78531dbf948b1c473a216136d26f9026cc318b6",
+                        "s" : "0x5a071fdea7a221c5621d9e54cd7d0462b9c73a3940193bb804609bb991a39f0f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d858g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d858g0v0Filler.json
new file mode 100644
index 000000000..b17b9a53c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d858g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d858g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61035a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x52406f2763d20df746527394556773e782d2207fab74551321a17938f0ecaef3",
+                        "s" : "0x02a612e05f39def0d3acee6112fa2f06d4e7b1ebfe666c2253d9617eedde0eb1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d859g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d859g0v0Filler.json
new file mode 100644
index 000000000..879956c5e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d859g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d859g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61035b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5c0a5549bb3cc6faf09f92dc1ce6f1f3b6c2964729fbfefc5222aced34589834",
+                        "s" : "0x4d2a10bb58b51a7538e11ee824bc66b68cfe825ca6ce2a6ebcfd1956175029e5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d85g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d85g0v0Filler.json
new file mode 100644
index 000000000..bf83fa6da
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d85g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d85g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60556064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x70066e9cf52ce0153e8c221f64f799aa3dff62f61c7739d20e7b4612467610c6",
+                        "s" : "0x3956b6d884406bbefad6e2e0d0e09751baa113760f17990dc978229fa771f56b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d860g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d860g0v0Filler.json
new file mode 100644
index 000000000..68dea51d2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d860g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d860g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61035c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc0d4552e3cd3cab61d75db1fabe7aff58cb11f42c9bb40994c4b71f9e701f546",
+                        "s" : "0x0d1ee1947076315048c554878365751b9cf6fb1c2d73a123f369eea8bdbf22dc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d861g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d861g0v0Filler.json
new file mode 100644
index 000000000..d056c0255
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d861g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d861g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61035d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x34ae43c42d0c2dcd1fd30a211fc8bd5d99f968fb5c6822c358c3eaebfb1d0985",
+                        "s" : "0x7e12b98eca22bf5f733e1751b21b10edb310712ab01e111b8629d2d4fec51844",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d862g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d862g0v0Filler.json
new file mode 100644
index 000000000..fcf91c1e6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d862g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d862g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61035e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x37026bdc28c58f6c510ee18e511d6a587f3fd5d3b5cb6a59df12ef9d50be45d5",
+                        "s" : "0x62254bb9c1bf0e87d963ef5db91bb0444db99ca77fbd5fe3ce40e8398d9c9c38",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d863g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d863g0v0Filler.json
new file mode 100644
index 000000000..1ff83103a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d863g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d863g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61035f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x96cdc53e9f063372e771d118abebca36014942fe14eeb6df543f02b87e2a81b5",
+                        "s" : "0x0e66d6c8809461c211c6f0b9457372334c4f2acd02ece3753f1f136e936f98b9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d864g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d864g0v0Filler.json
new file mode 100644
index 000000000..8c2853aa9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d864g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d864g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103606064526000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x408bc3786f1b480f75dd2ce530c7c9beec2ad43dd5adb28256ff09c2a5e7ff16",
+                        "s" : "0x2635158a1b9560d633a58663cf57390db6b86b4f815cbb957e5248efac0251f6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d865g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d865g0v0Filler.json
new file mode 100644
index 000000000..096bcdb23
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d865g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d865g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103616064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2fddd05d84d856be38114b4d903867909aa45f22b0c67ef362386a3112b9b01f",
+                        "s" : "0x37a88d6009c7c7d1d13a7786082a213df1abdb826a1b3df3fb0358becd777299",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d866g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d866g0v0Filler.json
new file mode 100644
index 000000000..4c81722ec
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d866g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d866g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103626064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2fed8d4ebd5bc88dc46139585799d44e21f25243a52f0af5800718ad24bce602",
+                        "s" : "0x37dd5645906de7f614cdb33d698398fb1d155d956e03bfa8c3b527516806414d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d867g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d867g0v0Filler.json
new file mode 100644
index 000000000..ac253aaf6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d867g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d867g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103636064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa90c4bdaf05e721bca45c3f5375987e68ee00ab481eafc7a129647715179b168",
+                        "s" : "0x68710a02725e5e2c0740bbc31421d35f66ead51ad60beee81f6e78460ef96d55",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d868g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d868g0v0Filler.json
new file mode 100644
index 000000000..1a7c9b75f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d868g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d868g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103646064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x64c15bc23e9214cb6ffd451820577d9c3cb32c6f08eb0d26bbebfaaa03fb9b55",
+                        "s" : "0x6fac30a212492c07997d7ccfada3f127e638af47c8ae634f9dcab35284c6cf30",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d869g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d869g0v0Filler.json
new file mode 100644
index 000000000..c07bcf394
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d869g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d869g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103656064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5fed1b4e7b33eba5045565b91e3d9500bd6ef63bc6f399372e65c6e5042ee10c",
+                        "s" : "0x45be2ccfa25a808d921c6cf88a47c92f6c73d0cf64fa5a064022fe57243dcc47",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d86g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d86g0v0Filler.json
new file mode 100644
index 000000000..a4d3e6cc1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d86g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d86g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60566064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9765baf3e3b1e050545f7db1448b800f71b1a26896dc3b87f20622042eb98904",
+                        "s" : "0x294aa7ff5631af83d130f17406e177819d54c2e2c3a77e0eae64de8dfa3c5137",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d870g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d870g0v0Filler.json
new file mode 100644
index 000000000..600678f4b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d870g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d870g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103666064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd01a99b3127fa95eaf1ceea6f93c9f124f9a20bf912e17ab49b7e1903f748deb",
+                        "s" : "0x4ce1e86df3401b295638a72c9426cb81550208338b279741b1f4c94dd2199b88",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d871g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d871g0v0Filler.json
new file mode 100644
index 000000000..a05af7bd2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d871g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d871g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103676064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2449ea5806c495b6f83523dfd904329017a86656a299036e49038f818fd2380e",
+                        "s" : "0x44eef3e2303568e45072ba56db9e4ea6aa133fc2270d4d9a618d9a34568be43c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d872g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d872g0v0Filler.json
new file mode 100644
index 000000000..dc7b3b91d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d872g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d872g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103686064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb6bac6cbbeb481eabdc554e982a8af84b792eb00cb25ddd97475c88ba1eedd61",
+                        "s" : "0x7c4f7d61d2ce04c2124e471f8907240a2e76a186f1573206131a039b7fd6f4cc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d873g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d873g0v0Filler.json
new file mode 100644
index 000000000..610769268
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d873g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d873g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103696064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcff0a1f71bcba1e6a7a425ae11b70e5139f99b109da7d8e6dd81f99a78435260",
+                        "s" : "0x1824969df65fb8b31a4d8123a164f7cb9cfc25c74739b57073eabc82d19744d0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d874g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d874g0v0Filler.json
new file mode 100644
index 000000000..cfa560705
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d874g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d874g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61036a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x927ad5ff7650cbf6cab5e896de778e540e5eb4dd1500ec1f02ffbd6827f061b7",
+                        "s" : "0x02f87de79e3f95eaf36eda573d9ad49c80a30f643a4f95ca7bb77907574ab6ca",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d875g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d875g0v0Filler.json
new file mode 100644
index 000000000..db898144c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d875g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d875g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61036b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4aedbccbe78b2db354aa5709c458c0ca727084d906036c55fcbeb3590cf64303",
+                        "s" : "0x64a7aa336ab9a010c0e4b4036d71fa20828cb6779c9886a7f8bd00e6bbf5cfe5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d876g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d876g0v0Filler.json
new file mode 100644
index 000000000..41a1fc55f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d876g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d876g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61036c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcc06ac6752c3aae9716de35a29592ae987b3a0af16cb59afc24eed327db413b7",
+                        "s" : "0x7c42969718249ccb02b998cc8899f5cd915a3419fc4a97aefe49eae99082a9e9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d877g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d877g0v0Filler.json
new file mode 100644
index 000000000..97ac724ad
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d877g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d877g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61036d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb995e736aa3e7c781489341b1104109a63de508d12ba44acac2ae3f689b6a6f2",
+                        "s" : "0x082d8cf69b55bf93bfd5b02bd71b8b303d0583d16b59668f46e2d43fd800b958",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d878g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d878g0v0Filler.json
new file mode 100644
index 000000000..df214d4ba
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d878g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d878g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61036e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc71d61b2c2b924492cacf88aca9c6735be10931ce5426a5c7fe228d0b2975fdc",
+                        "s" : "0x667f64e4cc70b289c1d270665fd4a456f771408456bd285a42d40addaa6b093f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d879g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d879g0v0Filler.json
new file mode 100644
index 000000000..e506d6a58
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d879g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d879g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61036f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfb5412726c32b8b4d704473812f177d867c812c0a0770482015c668228059065",
+                        "s" : "0x4cc3428681b414a93ac315c94bcedc6560d29021809c4275ea8d5f5aae5ff9a7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d87g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d87g0v0Filler.json
new file mode 100644
index 000000000..e0ef60eee
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d87g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d87g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60576064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7ac335f5ae8db139d342a1507a300597cfdccd85c21aa97dbc2c5189446788",
+                        "s" : "0x539b92fc2018a61b1e72d910c0f7066c264232fcdb18f95cbeb9f74b9ab4bbe6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d880g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d880g0v0Filler.json
new file mode 100644
index 000000000..48520292d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d880g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d880g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103706064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3c932866c34b409af5f3cb0af6fb24f0aa8f3a71db1eea386a3d06bf54f4e291",
+                        "s" : "0x121a8c6ced2269d061f0076689c635c6fd202a46f2edb4a1e5eea302513da436",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d881g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d881g0v0Filler.json
new file mode 100644
index 000000000..e167e5d48
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d881g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d881g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103716064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x771f2c144d1b888be3d3eaf736baf1a7c3fb00acb37135b42788928f28e02211",
+                        "s" : "0x07855bc8e415d5b7525e72b88dedfb9223a612712bb58293e9d6a1a202e42918",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d882g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d882g0v0Filler.json
new file mode 100644
index 000000000..58da678d0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d882g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d882g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103726064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa557974f58810898c951a2f103463f80eaeb74448e51e293b3951a662885af67",
+                        "s" : "0x68d9706e52016293d03e3f5fb54ba80e870a52109ec2ae9404c88d8da83a72cb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d883g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d883g0v0Filler.json
new file mode 100644
index 000000000..f7b412018
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d883g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d883g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103736064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3fdd06ec8fc33c992663a5908a5e9ed6114cc0e72542d1fc558a4369b0c2dec8",
+                        "s" : "0x132b9f11063baa226beda6bd2c269d8399a4285be0f64488bd229ef180b785e1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d884g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d884g0v0Filler.json
new file mode 100644
index 000000000..1b5cf31e5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d884g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d884g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103746064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0cccdf74e280f8014e538b80aeeaffd078791677d4bb38d19e379ab7af28a978",
+                        "s" : "0x3a2bd1d722a48921824f8370f4c937c68b8079420c5e5f34ed9d20d01660439d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d885g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d885g0v0Filler.json
new file mode 100644
index 000000000..77f3d08ea
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d885g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d885g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103756064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x079a3e1e004c3890e554a35d83afc6407ced0ea5d55bf4f5f586ed63ca5664fb",
+                        "s" : "0x627faf9672839a0b5a9d0fc2575569ec6db546aeca5ae4df70ecfbfb7795ed7a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d886g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d886g0v0Filler.json
new file mode 100644
index 000000000..df6314ee6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d886g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d886g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103766064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x44d5b52cb6b2ef2bed26654b65066c1d7bf6d90e36d94eb96da640e7adf676f3",
+                        "s" : "0x76fec0b71555c46c1f4463fbe70072b73162d902ebcc6821aae22ab9adb7e74e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d887g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d887g0v0Filler.json
new file mode 100644
index 000000000..1c85c4732
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d887g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d887g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103776064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe5212cb11abc8e7e6885a9cb62d042008a22e724a9248226e12f975243a7bd9b",
+                        "s" : "0x0e2f97db9169d645991b1630a054ebad0ff0f4ef9182be43d8508d588f9116e4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d888g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d888g0v0Filler.json
new file mode 100644
index 000000000..04dd958a3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d888g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d888g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103786064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf2953d150fa5b86c139a19a0e3e5db9159066291eb59e286e3bdad9248e2953d",
+                        "s" : "0x06e71b71d3daa3016f8195b8b8905ef7b164316630e31b4fe1b7ff72d7afe571",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d889g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d889g0v0Filler.json
new file mode 100644
index 000000000..87540ffa4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d889g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d889g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103796064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9f253d2dec5c640d4d25a8bba1e4eae061d4410c565cf59d04573df191fba846",
+                        "s" : "0x3d0d319ebb860ba8e00155c726d7bc9e7166f03c56c2c891c73a1d06e16db904",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d88g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d88g0v0Filler.json
new file mode 100644
index 000000000..d732ba7fd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d88g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d88g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60586064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf5b877878ac4290914a95ee2d1f8732480020858c8c81c22908ab17b722aa247",
+                        "s" : "0x37071ee59f851cdc29400c57ca180b48d7f1b6551500e19bdbb1705f7e0f53dc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d890g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d890g0v0Filler.json
new file mode 100644
index 000000000..55793df43
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d890g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d890g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61037a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9eb8c3972549a3add0b374c6ef5a00239636dbcb18a71d25f5c9f081ec336002",
+                        "s" : "0x7afcfa09084ecee2376337ec5ede4cf75840e1700eb29a719a7817a6d1b57514",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d891g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d891g0v0Filler.json
new file mode 100644
index 000000000..0ecc56f30
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d891g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d891g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61037b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x023f763046a1bdf201afed6fd5b75e6127946e464464b54f589166b387c6965b",
+                        "s" : "0x6e216ccbecc05751a23f52fbb10374391d7464cb196f4f533c23f464e1fa59ba",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d892g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d892g0v0Filler.json
new file mode 100644
index 000000000..55ccc0ee3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d892g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d892g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61037c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x449a679be7f0bad64845220266b96ae05673903da06c7ce28db1f9ae101058be",
+                        "s" : "0x082aa32be5b4914b077ed102906f993d44de9a2263ab6891e6b6cd38330b4400",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d893g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d893g0v0Filler.json
new file mode 100644
index 000000000..24024aced
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d893g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d893g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61037d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x637aecd3496e1e00a24cba7197e5d9ff4e499c8bdfb687029b15c8936142db16",
+                        "s" : "0x2e4222ee6eb8c48bcc60f16422458fdd2ed55257476340dbc65e6d0e955d1171",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d894g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d894g0v0Filler.json
new file mode 100644
index 000000000..f9975c887
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d894g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d894g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61037e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x93813facaf3880736172bdd630c16de941409071960038d00e147b4bfb0f860c",
+                        "s" : "0x09a17456024d98354a537a4f2aebab25744670c57d9b6a7fefc2214305778fe5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d895g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d895g0v0Filler.json
new file mode 100644
index 000000000..e792758c6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d895g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d895g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61037f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0936f7ff0e126d43a3a18cd5de4032d20fea9b70d14ccf528c35e393edff87c9",
+                        "s" : "0x2504cc4f821f54035f7f4b304683c26253a47e75e30aa3a388c39cf0927fd350",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d896g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d896g0v0Filler.json
new file mode 100644
index 000000000..54ba513c4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d896g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d896g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103806064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x752fe1133a2a197ce6c16e1db3995a2cdf5c3022bc973edc99743272f05284d7",
+                        "s" : "0x1475a23b6b34a9e588495ef09f9da18b1deb88795b051274c52cc82200051c5a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d897g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d897g0v0Filler.json
new file mode 100644
index 000000000..369456e72
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d897g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d897g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103816064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc692d4e928b1bb05c53457992f58427ec6e3286e5dac7cce3f18545882d52491",
+                        "s" : "0x688fc21d9efcf9d790a319194d9d4917e2253a3539a4bf049f245bc13ad17b0c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d898g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d898g0v0Filler.json
new file mode 100644
index 000000000..2df2b8632
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d898g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d898g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103826064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb106eb29b1845d511c46712306f8c6fce9f89472aa7c3df1a2ce05577a340f9c",
+                        "s" : "0x6b6931025f3a2b8fed6c733772b74cde4437d31c253f4f28e811081d370ec724",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d899g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d899g0v0Filler.json
new file mode 100644
index 000000000..af26d2f35
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d899g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d899g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103836064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf171b5d1ffb9e14bbb20581857506ac22c35fdc636a0d96ee981a32d1681332c",
+                        "s" : "0x731d698448f559e39b64bab6d82e4819fd4f925047c90c3fe13b38e11ff6cf25",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d89g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d89g0v0Filler.json
new file mode 100644
index 000000000..a82b34b8c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d89g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d89g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60596064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa94f5bf86f6819a260fce4ef5d91bbb9f7d4c41c799caf0ad660b779a4178321",
+                        "s" : "0x2f1702dfd9ba615f4f82b7d2483c887f160bf902514061f2900c5c68ffde7d7a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d8g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d8g0v0Filler.json
new file mode 100644
index 000000000..f5e4f1557
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d8g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d8g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60086064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb35aabe2ef85e3654b08ba2862afae8a7bec553799f81061215dc019b56739b9",
+                        "s" : "0x5f8298ad0060ccf40c01a1781e80e281c89ad7d59743e8e27e160fee59be113a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d900g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d900g0v0Filler.json
new file mode 100644
index 000000000..5ad5322ce
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d900g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d900g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103846064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x56a77c87c2dca4fb1aa60707e29a6d7191b319fee7958b0aae3d0c50b5f112eb",
+                        "s" : "0x54f6c2b39e7dc9f28ed2b4a02c024209ba7aeec3cdee0757967e64ba3c25cc63",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d901g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d901g0v0Filler.json
new file mode 100644
index 000000000..686d98952
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d901g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d901g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103856064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x48a121837fafe2aaf23d5155b8b7a199c444d626395864dc5fd5c29248149164",
+                        "s" : "0x26f090d769bb0ebb1abe9c2a21b03a3b45811e309bd3463c79b980514c4c19f7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d902g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d902g0v0Filler.json
new file mode 100644
index 000000000..75362591d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d902g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d902g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103866064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8016e1ca4e77359fb1cf9c87ae8e3ac6d7a8c82e511570357da04890dec5d123",
+                        "s" : "0x09a88c87a737013b3e6c97d39cd6995785c0f804de3299f96bba9afc2a9feae2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d903g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d903g0v0Filler.json
new file mode 100644
index 000000000..b0fc5a379
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d903g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d903g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103876064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdb66758a426ef9307b3c91588e84e421da3ccdb7c057a77cad82b3abddf6f02e",
+                        "s" : "0x114c6b55611535f90e68b1588d328eeb0e45431771994ad5b3a8f61e5564ac37",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d904g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d904g0v0Filler.json
new file mode 100644
index 000000000..e4537d105
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d904g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d904g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103886064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbd2f550969d7bab4c1b135801bbbac21bdf7b3b077e34d21cfe24774fbee8481",
+                        "s" : "0x301f34ea90b46f15617c01aa1804819f54dfb2eb157d85a48dc87480552c9f17",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d905g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d905g0v0Filler.json
new file mode 100644
index 000000000..8ce793b10
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d905g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d905g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103896064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x226b943b8c557a8f90dbc7404f5be08ebd8942ec9ac121078bc39ec22374732f",
+                        "s" : "0x71233f3b26e8010f4e27d99ec18b49081e506dff01105be46cafeb7fa2839985",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d906g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d906g0v0Filler.json
new file mode 100644
index 000000000..d3d1e2092
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d906g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d906g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61038a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf43857c6e2769c96fbed403d57df311c70663c9f410d42c08e48af381be6bf98",
+                        "s" : "0x15bb449b6cce75c0fad572d76f85b7c1b7e8153ddf6c84743511839e0a555d32",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d907g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d907g0v0Filler.json
new file mode 100644
index 000000000..156888092
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d907g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d907g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61038b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x45a905b621b2387516c178a18c055c71c74af901f0851dc61917465e23b2bd95",
+                        "s" : "0x67ace74760e453284ed9d17e610b3ebcb88cb5a3b0d61b26b4e11b9551da7394",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d908g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d908g0v0Filler.json
new file mode 100644
index 000000000..76293fbc0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d908g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d908g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61038c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x574cab8a5d953f71b0e2066edae35af47439dfa3c3bd9a678e5f0daecce560e0",
+                        "s" : "0x3db764dd69c8f04c6210fe8f80b11065357df2133bf0b56519744f5668edf2ca",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d909g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d909g0v0Filler.json
new file mode 100644
index 000000000..88fc74ba6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d909g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d909g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61038d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2a2a150dcd1e7127281fa4c354853c74b61117465a71bb66679bf3c77b84ab4c",
+                        "s" : "0x5c2a19f41405485015d3e5a3cb7bc6422e5a04a8bebd9f8840fa36d259d1e54c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d90g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d90g0v0Filler.json
new file mode 100644
index 000000000..7d10cc438
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d90g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d90g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x605a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4f0cb5f2c7c7dd04a9c7bab6bd4e8c07851f5df71076d49f208f7be71fb7a89e",
+                        "s" : "0x7261138aa5c67f11abbcf7622bd0d97101d1b72bc3c3166016d566ef714d4b33",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d910g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d910g0v0Filler.json
new file mode 100644
index 000000000..76448e9ae
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d910g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d910g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61038e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3afee2304c5dcb3f738ce01db096be421dd079a15c480e0378f0c07c19e5ead4",
+                        "s" : "0x3e845cbbc4e822cb56708b79c8dd44062c9d9512b730a0786959604a07b4f743",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d911g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d911g0v0Filler.json
new file mode 100644
index 000000000..d63d7d335
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d911g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d911g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61038f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa4bf15fb011279bdc6694f63e70d51c7febd4928469d0ea8a160826ad23072b8",
+                        "s" : "0x2406a37af360bf7f6730119543baf92e4e9c0e46d204b7c3c88e3411c3866cac",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d912g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d912g0v0Filler.json
new file mode 100644
index 000000000..0d2d83c21
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d912g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d912g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103906064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6f521f4e3337e6b4e242039841984bdbdcf47e8e67d22370d83b9099576c0e67",
+                        "s" : "0x5b27d7cd851bcd7565ea16aeb033f0701d7f8bf0fcfadd6aa436729dcbea13ea",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d913g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d913g0v0Filler.json
new file mode 100644
index 000000000..598621b45
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d913g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d913g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103916064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x046c5420fc845caa659d1ba4177c6a77332ca76b9d97854608b8742e84d4db4a",
+                        "s" : "0x1888286e2377fb124d84d5874506777d893584f0df681cd8a97a81a7487ac95a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d914g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d914g0v0Filler.json
new file mode 100644
index 000000000..198733520
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d914g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d914g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103926064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0f19ac19f6357ff9710b927a5029c08af9de4c51afd27c3983802f8253027458",
+                        "s" : "0x2d676e02f4d6e8157db141e38f0ffa0d65babf5b736bad2cae07fff11eef8d90",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d915g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d915g0v0Filler.json
new file mode 100644
index 000000000..740645dd5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d915g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d915g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103936064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x682f513da83fed17036abfe1f069edce1204d2bcd626a8f9f157c7cb4b7a592d",
+                        "s" : "0x0a195c1cb16c600799ed92f95b612333184dc2300c45292d4df71c404e009b72",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d916g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d916g0v0Filler.json
new file mode 100644
index 000000000..431d215fa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d916g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d916g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103946064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc8baf46d5e1a35fdbc739c57edf2a55178e3007fad08540852f72ae5e69b847c",
+                        "s" : "0x3c329454c407b03659bb1e91bfcffd5b61e16ea14c44867f84bc770fc7247f25",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d917g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d917g0v0Filler.json
new file mode 100644
index 000000000..38a161a9c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d917g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d917g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103956064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x63e9b336cd7ee5db27fbdfc59e53452c530d83d7b3b988f337fade0eb54119fd",
+                        "s" : "0x5049ae2fa8076aca01366517805649bfdb6b4ee78db015f5d1f40b4615c158e9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d918g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d918g0v0Filler.json
new file mode 100644
index 000000000..4de80e6e1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d918g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d918g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103966064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7796dddcb2f089075cc92be4c02d395a07065181737926d591253bf23b7d9207",
+                        "s" : "0x175e6a7dd4193c425f39dd6b5cac979151a2c4998f73b4b08cb0fdffae108c06",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d919g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d919g0v0Filler.json
new file mode 100644
index 000000000..a40149293
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d919g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d919g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103976064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8fdb868082a44361a980632cc501dde8113419284a2fde72ae55dd38865e965b",
+                        "s" : "0x58ce11e47fa12f273fccf8497a3d1ff5f0913f4f248acd4b24e069f8b74767fa",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d91g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d91g0v0Filler.json
new file mode 100644
index 000000000..447a5f123
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d91g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d91g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x605b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3b910538252ad71933cb03cf1215a44b3fc81fdae6032603b82d7b5c744e8ae2",
+                        "s" : "0x2ff72c8b42e560786de1c06d758beeedd8b27c70429335addf596bf347cc49f5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d920g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d920g0v0Filler.json
new file mode 100644
index 000000000..bcf5126e6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d920g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d920g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103986064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7d1644ec72223acf66b854590b8b2e79535f67e7126e213781226b991816a8c1",
+                        "s" : "0x26d81812b9f1b80a113f334b2c5696eb8949b720a00d4d11594a57f70f874bcb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d921g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d921g0v0Filler.json
new file mode 100644
index 000000000..d481bdf66
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d921g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d921g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103996064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x04fdb8f90e7241aee12290d04274432d0d600b719279d6e0393942bc08ed49b5",
+                        "s" : "0x6da6c97d4b60612971642d750d5dc6134dc23d8f70cdc4105bfe9818eedf0718",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d922g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d922g0v0Filler.json
new file mode 100644
index 000000000..49d0871a0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d922g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d922g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61039a6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x075342630a8d68e3d80d56c0a6f0718a0eeef32c73b1796eb4a70c823d43b624",
+                        "s" : "0x102dd37ad2f5a0019ac11c0dc77c4643b6a18904f92551aa67d436c9263776a6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d923g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d923g0v0Filler.json
new file mode 100644
index 000000000..d2e50a8fa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d923g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d923g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61039b6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa2035f2fdc4c8404bbe40e1730ae0214a5e2887af01b1b468583004a66fc9a51",
+                        "s" : "0x38e6c84a99485cc53b2fa80e621d12412b0c483e15307982d980ed4d5cd99090",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d924g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d924g0v0Filler.json
new file mode 100644
index 000000000..5588ba585
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d924g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d924g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61039c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf33aae0ecd749748f9ceeb6aa26e4ff775c53b05223d4ce9c877215bd0d8e671",
+                        "s" : "0x172a710f700e80b08ec365227999881bd0018d99223c30d59d4ccdf866704306",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d925g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d925g0v0Filler.json
new file mode 100644
index 000000000..b9f29a448
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d925g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d925g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61039d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x95faf442bb27a40a9df8ab52fe6836734915bfa3135f50d97c01ba26809df9bb",
+                        "s" : "0x553061a95e71fa931d051c21578d804d6190c8092fdf8227b8ae6a656684d22c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d926g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d926g0v0Filler.json
new file mode 100644
index 000000000..336e906ca
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d926g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d926g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61039e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa19ed0c832f71cebd296db6f925d5502e975e8dc287cc7251c4f782b3a6bd825",
+                        "s" : "0x2f7f5a6ef15b10d0374fadfecc77a3a0dfe9f0f0e44c36f99912516f40d0d2bf",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d927g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d927g0v0Filler.json
new file mode 100644
index 000000000..7258b8693
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d927g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d927g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61039f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0fd161bf3545751eb2e5e3f78a864ad49b118648fc85ecc2b2a1fe8414103856",
+                        "s" : "0x3eb6eeec3442001a51909aa013abb260547d7bc6f3e720968fdc813e5e85f12c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d928g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d928g0v0Filler.json
new file mode 100644
index 000000000..b74c908cd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d928g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d928g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103a06064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0940eb05c322e85cd725c71185167e6c29743183e6b7063ac75b8ec925d74067",
+                        "s" : "0x6bb818b9ccc69e14edbce568ff9163f397a3b47e31e99c157553b394af5a566e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d929g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d929g0v0Filler.json
new file mode 100644
index 000000000..27f84ce51
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d929g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d929g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103a16064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf1ad86d71b71e2fe71aab6ec15a250c899d5349e69153c6818fa11715903e6d6",
+                        "s" : "0x3fc56590ff16784b001dcf92191f6442f69474e75823c75b0cf422c662d4e059",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d92g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d92g0v0Filler.json
new file mode 100644
index 000000000..9ddd6774c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d92g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d92g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x605c6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd79161b9b608a8fc5b3b9f1ceae7cce8cdbdb186605d400562557f78d1bc7273",
+                        "s" : "0x317cbf09635ff5970257f01f2f3defb6ea53d9c0182f3e9ba672f413e46e2f05",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d930g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d930g0v0Filler.json
new file mode 100644
index 000000000..e68e37f1a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d930g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d930g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103a26064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x77d6d014fcfba8f3de75f468f5cb168de60d9bd44ab3cf3368c4a75db6868938",
+                        "s" : "0x0fde1a5f6994ceffa9933bb8034d9da009694ad46ae32d191f6ac4201e032951",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d931g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d931g0v0Filler.json
new file mode 100644
index 000000000..921cfcfc0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d931g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d931g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103a36064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x14dab95fc6421674d431f971cc57af8796d6d2b3eb16c915a0e3b68d040c2976",
+                        "s" : "0x5bdc95608aeec4464fb03c25c0b78c33bebd490c20650577902b4568c9d07d10",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d932g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d932g0v0Filler.json
new file mode 100644
index 000000000..f665f9eb1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d932g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d932g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103a46064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7ca8a94b7c2292e599bf577e24c622a63991aabdc778764138ed8fac8f617ab6",
+                        "s" : "0x1b95f39c67311f3cb7b69bde92360e9d26dad950fe4c3a7e48c5722b4e0fc600",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d933g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d933g0v0Filler.json
new file mode 100644
index 000000000..ea80bdc3b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d933g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d933g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103a56064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x62d8344c047fe82fa95ac0490ba0567eadd01d0c6b5cd3b3a973795d2012a8fd",
+                        "s" : "0x2f84a6c659546e9d8ebca19ca2eb974a444a88f07977987d7eb3da1a08940bef",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d934g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d934g0v0Filler.json
new file mode 100644
index 000000000..9432a1fdd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d934g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d934g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103a66064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2c5e582dd6c515130f63830d5516fbd6c09b2da7f07e3dca6e5eaf2ef0bcd650",
+                        "s" : "0x76a658bbbf732dc96e0812ffaa86446fe3efcd7f662397e3cd1e3decf5efaa23",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d935g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d935g0v0Filler.json
new file mode 100644
index 000000000..609d973f4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d935g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d935g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103a76064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x630236a09a9177826032e29bfb1ef73be1bec0319d021c14877d910efc6e423f",
+                        "s" : "0x55da78d92cc31b85cc59b5f7176a8e3f920c4e5b048686a1b4610cef6fd3408e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d936g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d936g0v0Filler.json
new file mode 100644
index 000000000..9ede88668
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d936g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d936g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103a86064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x09fbb497ab415ce989364cba5e266c30d85a02d253acf97de62729eda4245171",
+                        "s" : "0x756d6a9972f78f6a2d2d0989105a23eb3a726045fb2f6f6a4f9ad3115f47816f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d937g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d937g0v0Filler.json
new file mode 100644
index 000000000..603039506
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d937g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d937g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103a96064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x93357587c7e1c850361431d59c38c152b7898ad24ea94cb3f3bcb689f8d89f83",
+                        "s" : "0x34e3a131235022e278064556f7ab28ea1b5a345fb0bfc8555d2afda337ff5119",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d938g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d938g0v0Filler.json
new file mode 100644
index 000000000..f94dcf455
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d938g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d938g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103aa6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7f87ed492d34606e7f8deb1a6987a5e42f94391e3b7659917f85dab5ed8785be",
+                        "s" : "0x65aae9d325428786315a0b6de9e876bb265df586778151f1142bc58097c7b971",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d939g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d939g0v0Filler.json
new file mode 100644
index 000000000..7a9552095
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d939g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d939g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ab6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d82a8139e6e9df6e4ec8c304f4deee5b457732bede1616fc56d6626bf81f964",
+                        "s" : "0x5e28cc91b57cf5579b08a772c8187c6b4a4d5a0c7c25af11add5acc451927648",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d93g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d93g0v0Filler.json
new file mode 100644
index 000000000..f1aa46ea4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d93g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d93g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x605d6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xad660569f579f288725313d44e0b796fc721d460c098b5d01a3ca7b0928a7c27",
+                        "s" : "0x46710f7bea55bb8601676195ddd47ac8412dce99e972f40e46515f76e141eeeb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d940g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d940g0v0Filler.json
new file mode 100644
index 000000000..c4acdf6cb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d940g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d940g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ac6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa711e01cb8017f15839e2216fa7ae110a96dd61058ec0f3b5835798b538c3150",
+                        "s" : "0x577b2540f765a20411a2fc58eacbed76281320ac9a8b3233e7b63994fe65322d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d941g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d941g0v0Filler.json
new file mode 100644
index 000000000..9b0dfc75a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d941g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d941g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ad6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe049cf06f6a047d251e2ae59c92e9b7c22f7a9aaf635a7ff0a03a115116e4c9c",
+                        "s" : "0x2ea144a842eb3316a70ea86d16aa3b9c5bccf8fc1a690ef1fdd9a43d87842eb0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d942g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d942g0v0Filler.json
new file mode 100644
index 000000000..c2029f92a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d942g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d942g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ae6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfa9b900e19aeefc4ac56335cb77d2bef2bb5f4ce4e05cfca78b5da718db241fb",
+                        "s" : "0x660ad23b24ca3d15177dda9bf5f70103cd6651c1386b45381d5439c115748164",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d943g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d943g0v0Filler.json
new file mode 100644
index 000000000..55c88eb3d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d943g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d943g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103af6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x894bd8b13e222bc9a12f82cf0c7ec483112b66d78203fa79db346f96aa6a779a",
+                        "s" : "0x08634b503e6d11df8deee70bd113e81eba11318d38b3fdcbed97e16e1a7244bc",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d944g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d944g0v0Filler.json
new file mode 100644
index 000000000..4b669842b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d944g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d944g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103b06064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3a0c05354be46104c236730d5529a2f732ce87ccac08ddd1b5c243b7ba419cec",
+                        "s" : "0x58d26cdcb438ac8ac42f20b09a5dad72b5ef27be73f2377a3bed09115f1b0283",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d945g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d945g0v0Filler.json
new file mode 100644
index 000000000..859547988
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d945g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d945g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103b16064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x10de0527f4f202b1ac048e0f448cf2f95cafbd69a9bd0b572d68b21de34e7c71",
+                        "s" : "0x6217852dd0593b5ee849fd9d1b80258d66e42137b5e8754df848ec089c8e5da4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d946g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d946g0v0Filler.json
new file mode 100644
index 000000000..32dd0818f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d946g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d946g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103b26064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1e353f889266721a0ae1051acedc3d6790b1fd4f4571827e2b4b56bad0eb1cb4",
+                        "s" : "0x155e5d1f08c0bb910cf7026a9b2aa74e84f84e847709fb740e39e8ae22b0a73d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d947g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d947g0v0Filler.json
new file mode 100644
index 000000000..e0cd51db6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d947g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d947g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103b36064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7c5dfaea8ba381bb9c4e656f96754d697891b00eba9efb63acf498c938b5461f",
+                        "s" : "0x14eb5218c98927393d39d16cf0e6fea3f216163a51d11b8427587b20eb404b76",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d948g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d948g0v0Filler.json
new file mode 100644
index 000000000..726358343
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d948g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d948g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103b46064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd7d2285ea5866692485be4be4638cc5d7af2723055974a67d81926405548216f",
+                        "s" : "0x6c5b4dce35c67deed9fb3007416c334d95741f4131ae763e5cd1bb5e8de16913",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d949g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d949g0v0Filler.json
new file mode 100644
index 000000000..c38d60dc2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d949g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d949g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103b56064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5aed7dccdad72ec0db8bc6944224cb9ce4911b638fed1a8ae0e0348e9e6d0a60",
+                        "s" : "0x73d6ff3bc1ec79690c34a4e0c3a275f615b40b531b7c11832c5e68edfd09da01",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d94g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d94g0v0Filler.json
new file mode 100644
index 000000000..7667122a8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d94g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d94g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x605e6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6514c9c9f17313c9f9f4e689817dce33bad748986b44214cd42a05d1a47c7c15",
+                        "s" : "0x3d0a685a9c635b08b34ed8e9bef079b4e5d6a27937b16d3a29c6c94b6e43f18f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d950g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d950g0v0Filler.json
new file mode 100644
index 000000000..f3f9edb78
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d950g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d950g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103b66064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7fb7886366cdc60fb0043389f35a660fc465c80029038ce4bd18ccc785b9ab7c",
+                        "s" : "0x57b9c148956acb45bf935d8331cf26485c02e1b09966c8283587ce9a783cda06",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d951g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d951g0v0Filler.json
new file mode 100644
index 000000000..bfc691746
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d951g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d951g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103b76064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8ca8b0a1df647608337416121660ad063f353fc45896267ba3719779bf4872aa",
+                        "s" : "0x5f4330f5bef7db3eee339f48c876d6fc6b8ad7e3ccb8a4af9672cd7787596bb9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d952g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d952g0v0Filler.json
new file mode 100644
index 000000000..f60cc7c73
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d952g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d952g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103b86064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x76d75c0d4bc322fae672d2af3b9f78309a1cbf0179ce92fc819fa32a3ba81d93",
+                        "s" : "0x384a5ac9b762c8d806af1223389de471a10fc85ea499685f4c177e35e4c6c226",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d953g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d953g0v0Filler.json
new file mode 100644
index 000000000..24d841d06
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d953g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d953g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103b96064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x66400b9054ff1a998539ced12f228dd0989ee4fbe4d9e38c2e7c87cf0b714f42",
+                        "s" : "0x7efe0e858da0930a49501f63b3772434a97bb14d8686d8420a954ed84a7a0c0b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d954g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d954g0v0Filler.json
new file mode 100644
index 000000000..96d4b481a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d954g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d954g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ba6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4c3505fa84810264b77dd264455ed93e5044c2202dd1f13948b98c44ea5038c5",
+                        "s" : "0x18f389623a2191155c9afa009db0f4ef5898ebada3fbe804e3bf3781faec7843",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d955g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d955g0v0Filler.json
new file mode 100644
index 000000000..eeae68c9f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d955g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d955g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103bb6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7e3a4ca4cec7a801808f3fff843330f6546fe4ef5ec4934a8ac450c0b2c57cc2",
+                        "s" : "0x6a834d0c700cc05c089bbb6b4b49de226d1334e8f7005bc9bcbc0a3903bfa93f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d956g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d956g0v0Filler.json
new file mode 100644
index 000000000..f08bbb5bb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d956g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d956g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103bc6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf29a24b3d00aaad289cf8acfd080d8999d5a4f1c924a44459e02f9de3841ced1",
+                        "s" : "0x1b8f5676cf521a76dba2f44e240a89dcfe8a4389ea1693051a005efde5ac90f3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d957g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d957g0v0Filler.json
new file mode 100644
index 000000000..76fb1b923
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d957g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d957g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103bd6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6659ea4a89e59a34b25f9e2fa00d13b9ddfe7d2e79407a12b03452d8c0a5a0b2",
+                        "s" : "0x5013f6c32021dd08d50604e3dc191d20abe1fbf703330ee86a1c3e47d9dfaeb1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d958g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d958g0v0Filler.json
new file mode 100644
index 000000000..848e9ac0f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d958g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d958g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103be6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9dc0893728620e189890f6c572e3ec1ba02fb04775705580a553e0dc877c1935",
+                        "s" : "0x5bacedead97273a200b7272128edd0b0e4bba4d097eb55ce6170e3ab2a9fa792",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d959g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d959g0v0Filler.json
new file mode 100644
index 000000000..0b4c7a219
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d959g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d959g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103bf6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5dcde30cf7d66b24ed6557f2d1f978d18645a4b4a87450953bfeda6b701fd32d",
+                        "s" : "0x1afd3ee3e6281f43bafb3b01e3ab18ea9c44eacbd9a762eaaf5b968cbadb03a9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d95g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d95g0v0Filler.json
new file mode 100644
index 000000000..60a63da07
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d95g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d95g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x605f6064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x68eaba7b486892dc1bc96c6da77337d72611724d7cf6201d12423ff757217d5a",
+                        "s" : "0x3ba727862ed2ad04d302a83c9ffefa75adff5d374df3bd797c8256f0997fe4c3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d960g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d960g0v0Filler.json
new file mode 100644
index 000000000..89833cf3e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d960g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d960g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103c06064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb410384c510c64379227a6a64490ab28568c62363b84df491700f6c26d89bcc2",
+                        "s" : "0x3dc25f7615fab4a159bcc2e11a1c099cf582ee4d661e44a80c4f956cf0601e92",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d961g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d961g0v0Filler.json
new file mode 100644
index 000000000..b5db96602
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d961g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d961g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103c16064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x85d79973a15c0afcb398b5a0134050ad2d148454aebff506c2cdd75174fd595e",
+                        "s" : "0x5cd52c52d264d4dcf6e171ef140ac34d2ca48adec9bde3db182c971f8e8e0333",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d962g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d962g0v0Filler.json
new file mode 100644
index 000000000..eed5c5c83
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d962g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d962g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103c26064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf6fd75d65e9665ffa09deffc02c9f7735082d09863591eedf0e2364400ff7cdd",
+                        "s" : "0x09a101b4a70b0777e4068146d3b2e557898286c9e514b051ac56434bfdf552ab",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d963g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d963g0v0Filler.json
new file mode 100644
index 000000000..4d52b6794
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d963g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d963g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103c36064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8fd167644f3f730ee755ab575e5188e4353a7dbe8e6661c16019eb1a598a672d",
+                        "s" : "0x10f894575a5ac22d9931fc2afa52183897fdc0fcbdc6c941b0366fd53f58e7ff",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d964g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d964g0v0Filler.json
new file mode 100644
index 000000000..080ba5528
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d964g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d964g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103c46064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x84bd214136c3ac8c26732933569a3dbbbd0014ff28e18466cc17343ea9cc9473",
+                        "s" : "0x7ad01c1a3f0cbd52be635af4bfb91f3bc98094e2d40ae0100f2783d56a37c869",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d965g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d965g0v0Filler.json
new file mode 100644
index 000000000..11126faed
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d965g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d965g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103c56064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf80a8cb06b0a0b2d9ae8f612b11b9c0d6fb1161f1cb9f4cbcae97ab1f7c87451",
+                        "s" : "0x65e32153040e620f4000756e33553e34b7707d2a10504fb1c3c942eb5043a695",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d966g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d966g0v0Filler.json
new file mode 100644
index 000000000..0231cce3c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d966g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d966g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103c66064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdb3e9f6b43b513729d7b4fd57172e4e803671c17299139eefdd56a2a76e5a56d",
+                        "s" : "0x1e3bee37426afbd492ae5539ffa0976bcbb98272d19dad7fc9a3965a89ea1b5e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d967g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d967g0v0Filler.json
new file mode 100644
index 000000000..11d8afd7b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d967g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d967g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103c76064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe2e383f6b3d0115b36d10d9f9fff234abb16b455ffdbb6053b313c5e2030bdaa",
+                        "s" : "0x12ff905aff4526079df4998b2648b1f14ae3b34fe39febca6ecbf41d5a64da6a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d968g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d968g0v0Filler.json
new file mode 100644
index 000000000..7e133349a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d968g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d968g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103c86064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x095447172ed390914ca85dfb55d97e5641d207a623b30fa1856ad52d49ee1e7c",
+                        "s" : "0x3bc947e2e5e5b44355f385ab0377ea921a807bbbd7af9ff5271902e7ebd29e90",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d969g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d969g0v0Filler.json
new file mode 100644
index 000000000..6996bcc6a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d969g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d969g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103c96064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x610b3c43c5c21b490422919bdf398fd0e02d3abd4efdac671bbcb23d553ac5b8",
+                        "s" : "0x3c52c299abb50efa6e3a0857c0e369397d61f9566c718e54e264244e335ab248",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d96g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d96g0v0Filler.json
new file mode 100644
index 000000000..995286dc0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d96g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d96g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60606064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe9bd9a2075bc5e353f711a681157d6a36094eb0d62693ce3f9a3403fd1df56f2",
+                        "s" : "0x5b55fed870c336d2d409fbec930efd04f8f9d0eb0f17d3f07094c12dc7590024",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d970g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d970g0v0Filler.json
new file mode 100644
index 000000000..c9308db90
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d970g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d970g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ca6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcf4b255d3ca9889d83c757b48bdd5bd9661def56e2da94bea20a63439562a03e",
+                        "s" : "0x5e7bdb5a1d8a76359bdaa976f1b16d95040b4616bed08c3a72fe5721563598d2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d971g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d971g0v0Filler.json
new file mode 100644
index 000000000..0341cad2f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d971g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d971g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103cb6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb34b550aac8ba8c32ac27f508b7c0308f43f9937f9665ecb207276478385880a",
+                        "s" : "0x683c0763fa113e0617a19209f0f619fdf395786ccb3f49bdd109c8216a43a73b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d972g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d972g0v0Filler.json
new file mode 100644
index 000000000..05615bbac
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d972g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d972g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103cc6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2841798a4867908cc336f2093794aa892d98feb2eda8456e73fc83fb5494f5e5",
+                        "s" : "0x316b4d670c30cd0aa308c16ee32d091250861e1df1a3db2c942f64cce937e982",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d973g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d973g0v0Filler.json
new file mode 100644
index 000000000..301f73e58
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d973g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d973g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103cd6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3172206a9dc00a15f52e9f387c0f7d4d3024902c005d9caa997529b97cdfe3d2",
+                        "s" : "0x0787f04498eb91d28db776e1831c35aaaa75dd0059793e2a5d77fc90349a4ab3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d974g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d974g0v0Filler.json
new file mode 100644
index 000000000..c578fa8d9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d974g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d974g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ce6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe5427e1fec6ed1d097c58f82e11df56dab6f540e4347b0a7a64855b87d461a68",
+                        "s" : "0x5691518b1c221e25e50e2f5105f3e944c5701b8c84586495784b31b966e11c7e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d975g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d975g0v0Filler.json
new file mode 100644
index 000000000..25717693b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d975g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d975g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103cf6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x164cc5588f63b8787c1b07c88fb2d9fc7323c926cc4aa6dfa1a4015a935f92ad",
+                        "s" : "0x0fe11748c30dedc301f2f1403c215274c1cf31962ddb26f147658e5b8d2439d5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d976g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d976g0v0Filler.json
new file mode 100644
index 000000000..85aabd912
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d976g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d976g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103d06064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xac7c8df98302dd21cab0b3598c324a5961135c3690586f92ab0ec353c994e9ad",
+                        "s" : "0x2be33bd13ecb2bc16ac805ddaf5506b33bccfae9b530c3a2f6808a862ab5a22a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d977g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d977g0v0Filler.json
new file mode 100644
index 000000000..b1f353a98
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d977g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d977g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103d16064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8913434dc1e2751a918f007cabf08255fa7619f8d161cabb8688153616cea671",
+                        "s" : "0x5a32f88ef72a76ad03c47d8f1e71771d4437be8271fe3896603e05d89bf50a77",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d978g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d978g0v0Filler.json
new file mode 100644
index 000000000..4d443cff3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d978g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d978g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103d26064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x31c9d27ebb42d402b105d12110a7706510a0decbbdcae43423e3288d70ca043c",
+                        "s" : "0x2417dd12664817306144b8a09f6c0012d7f2e83f133e383948e4e411a4eeac64",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d979g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d979g0v0Filler.json
new file mode 100644
index 000000000..87b6592f8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d979g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d979g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103d36064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x315dd2ae139a3be19c00f27941faec300ae276e5eb4a84c7df79531674cc86c1",
+                        "s" : "0x733eefbd19e5b4d2a70ea11bb1b18c7adda2b33964ce37ecf0173573c4f9739b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d97g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d97g0v0Filler.json
new file mode 100644
index 000000000..a56f0db39
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d97g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d97g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60616064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6a41d2af022e17aad23859efb598f942e076c7cb5041bad60cf8422337786add",
+                        "s" : "0x1d215fad79b727650f14d4ad50105da37e4a391b034644eeb5327aed5b5c2e79",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d980g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d980g0v0Filler.json
new file mode 100644
index 000000000..de0c7684a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d980g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d980g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103d46064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xae60123f0f1f13f80b0ebe0a07ed116ce0a0b068928da867f040e8787729e6f3",
+                        "s" : "0x447a9bf8f06be2fa3c973efab8cd1c56b66cda2bfc9eb58b6af1fb1ea49174b9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d981g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d981g0v0Filler.json
new file mode 100644
index 000000000..ff055798d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d981g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d981g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103d56064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x32265ade35aeed4be1aa3ff640fcd7fcbb1fdf7a0a83999fff597d8485031836",
+                        "s" : "0x741b27a81a4c6c2759c5a88966a04393416c067f7cd981efac0156a43231a634",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d982g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d982g0v0Filler.json
new file mode 100644
index 000000000..2e177331c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d982g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d982g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103d66064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x71ee97c9b541d874fe388520218a5cd70efa4faa522bad669bfa72bccfd02be9",
+                        "s" : "0x2f8318904edbb0e66db4fed1f3037dbeec96f3a93c0aa7c04ef9f008ba72bd2e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d983g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d983g0v0Filler.json
new file mode 100644
index 000000000..e7966e23c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d983g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d983g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103d76064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x98c90d688306994828794008457a63a4b70b45472b4774ca5d11a390424b35d7",
+                        "s" : "0x67db489acf06937faa188aa5b994acfdc359b8cccf8b783c73659a3f780678f0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d984g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d984g0v0Filler.json
new file mode 100644
index 000000000..a20c8f553
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d984g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d984g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103d86064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4705dcc86d4545aadd9aa5c4aaf2877356b1464a6eef8ba66ae2edd678d566bd",
+                        "s" : "0x23982bcc5ddaa0216e7e8ac45fab218ae6d748e8087b19cb00ef571884d83b8f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d985g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d985g0v0Filler.json
new file mode 100644
index 000000000..5bb064073
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d985g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d985g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103d96064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5562b70d0e42c8dfa7c3db1a1a7960441a8c8926f24a27e1ef02bde475fa058a",
+                        "s" : "0x1d97a40249f225bfd847dc804328dce72d00ab6e9a429c1a0f595af4a1207dac",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d986g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d986g0v0Filler.json
new file mode 100644
index 000000000..02b1c772d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d986g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d986g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103da6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xab092f96c7be6b07f3d5532cba4b46eaa5b5122e0b5a24abe8a6015165f88d21",
+                        "s" : "0x05a185c0a98515d7e9db5a1caced505e334c982b84bc93a7a5a0adbb74172d0b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d987g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d987g0v0Filler.json
new file mode 100644
index 000000000..aa2aa5271
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d987g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d987g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103db6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa70b329d8d5b23a0944911e8bdd64b55040429d993d29b886cd6ae7fa1f0d4e8",
+                        "s" : "0x334845dbd4228938374b573a2782970b821b7cbffa94885d9c179ec6dbb3e302",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d988g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d988g0v0Filler.json
new file mode 100644
index 000000000..c61d3b359
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d988g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d988g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103dc6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3eccf01aba693c059fd74011be4ded6e254387a8553aa58c8442e4c1eb28e538",
+                        "s" : "0x376362f328a03aea15d140f87eded3a0de7ff4d4d58b929954da6c7061c60458",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d989g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d989g0v0Filler.json
new file mode 100644
index 000000000..6a401eb76
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d989g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d989g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103dd6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb429bf08fafb07a164a39608b1278c1e36134fc81e57c51ec454c5b6ddd1a228",
+                        "s" : "0x5064420f5c6cab0f4061d0c571647a3747f45dd2401f9f9f28bc5922dee1c7e4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d98g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d98g0v0Filler.json
new file mode 100644
index 000000000..888dbba47
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d98g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d98g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60626064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd7efc8139d928ce7f7bf307fa91dcfb51533eb2658ac2f91559ef8014dd9d96c",
+                        "s" : "0x68b4e59cb15aa23ad003cc85bf9e54a37258c98a500f70c6caaa79aaca7db33c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d990g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d990g0v0Filler.json
new file mode 100644
index 000000000..2b98eeeb3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d990g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d990g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103de6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xba5db01a3990d6413104574a145ec5f8f0913f0452f5496cf6662ee2674c088e",
+                        "s" : "0x6f9bc8daedbe1100e68643585d2bf4b9d5141bbf3c45b06b20bfd43d4cf86021",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d991g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d991g0v0Filler.json
new file mode 100644
index 000000000..94a74c588
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d991g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d991g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103df6064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8ee4f57097266ee16c81efb349993a0c4349c52bb44c5cd3c68f32a63349e533",
+                        "s" : "0x31e79ae847347ad30b6802588f2451c05c8187af307528b3918df74b8df17c49",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d992g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d992g0v0Filler.json
new file mode 100644
index 000000000..1d1c7a2f7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d992g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d992g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103e06064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xecd6f7ae3847711cea274a62540e6893a703b20e8c2a59152488ab6a5a66949a",
+                        "s" : "0x786391dc3c1279753954c17276db1d2db9b866743f870861b9ce69a6a06e5025",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d993g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d993g0v0Filler.json
new file mode 100644
index 000000000..f850e6d2b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d993g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d993g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103e16064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x473e2577d2802024617afa34d809431df1b542b0984ddf98f41bf1dbb730f1",
+                        "s" : "0x052fedf8eec9dc96fe8bcecda39577f6ce5523071cd04e4203ff592713c8755a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d994g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d994g0v0Filler.json
new file mode 100644
index 000000000..e0c99cf3d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d994g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d994g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103e26064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d092305114a5cc3cfd343965b1b7a02bfd814a52e176aecbaa5a185cd7885fa",
+                        "s" : "0x645a094eb8f73f6be0ed838de2a884fa93e3f888eb64aad1e55a52089e8d907f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d995g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d995g0v0Filler.json
new file mode 100644
index 000000000..1d1253996
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d995g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d995g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103e36064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1fa0f740120dc597757561b14e413a07286fa2283c0bc0514002fe57ce9a8141",
+                        "s" : "0x4ea51475237588244d4c1ffdfa6ebd4804a7bb1f9273772a5aecb13840ed236a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d996g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d996g0v0Filler.json
new file mode 100644
index 000000000..e0f21cb39
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d996g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d996g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103e46064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xffc03e638d4cdb20803cd465a626cb1a0fa9604ad209b325f2366b3270005945",
+                        "s" : "0x7f85e11ce0f4b2e567be31addc9f1d3c90f126e21a3f14e4860db1802ddba15a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d997g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d997g0v0Filler.json
new file mode 100644
index 000000000..f35c0f46e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d997g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d997g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103e56064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbe94d42d110dfdff24659575a364b68fe265ae2dbce0ef27b83570c48cf5293c",
+                        "s" : "0x488fca72b65257e1bcac3b3e5521feee159fd96fdf5b69d2cc3f2af3fabeee87",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d998g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d998g0v0Filler.json
new file mode 100644
index 000000000..77d6ee91c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d998g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d998g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103e66064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x03cb207bbdcd254e1309d01ef67faf3a7dec4f8fbf0de5aa70d18353b11a3837",
+                        "s" : "0x1692200f4e811d0baff3bca05cea1c876859b70119f179387e23e6b02721a77e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d999g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d999g0v0Filler.json
new file mode 100644
index 000000000..45ec4a847
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d999g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d999g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103e76064526000600060206000600073b000000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b000000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x292eb9c71528b38d8173f4842d8733b44a1f964aa3317044a10b9aa333aa1445",
+                        "s" : "0x74f96f71dd2ff4b51175580b335bb925736e88dc9b4279389304276434cb7d28",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d99g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d99g0v0Filler.json
new file mode 100644
index 000000000..b6c8c2f77
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d99g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d99g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60636064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7ede31c036ee73eca8b9cb48b0f583a2ef926cbdefe44f88334a74932b63b308",
+                        "s" : "0x648bfd71ca4b2d4cb0604c4aa670a004297e2f26a9b1b1c866bf811c71e533ef",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d9g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d9g0v0Filler.json
new file mode 100644
index 000000000..0ca3b7b5b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial0_d9g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial0_d9g0v0" : {
+        "_info" : {
+            "comment" : "sstore 0 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60096064526000600060206000600073b000000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b000000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe97f8b2f48832d7fb02fc62fc3cb4b28f43278b9eed4cfd3c8f5118582463755",
+                        "s" : "0x0a72f852c7c855364b606f5cb3dfe310b5d555bb453b482389c43ca4df4bf850",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d0g0v0Filler.json
new file mode 100644
index 000000000..d47f4ad8c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d0g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d0g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6000606452600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2662b329a5e2df229664d179fa32d844b0cc1515124d43fc0486176851e043ab",
+                        "s" : "0x54b57c333be00acd601c32d4b83ba50d49dab231fcad86900e868d2228be2dd1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1000g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1000g0v0Filler.json
new file mode 100644
index 000000000..69934d5c2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1000g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1000g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103e86064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf35bff77a1ec931ecda396a520cf8fe6207c16d2120e89a212230c28f875d76a",
+                        "s" : "0x6c623d00a94ab12700740f3b9a1b87b242b5139210c45c959d0eeb25de1595d1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1001g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1001g0v0Filler.json
new file mode 100644
index 000000000..3c5d7f96b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1001g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1001g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103e96064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe1610e9b44c8ca7adf6d0f70c6b10c336d82976419cad4d4c4e582407f560236",
+                        "s" : "0x132fb27dd0e2d38bc77a44a603a06d917f3cbccba7ed4bc55e86d22a02a4c264",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1002g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1002g0v0Filler.json
new file mode 100644
index 000000000..f9b3fbb20
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1002g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1002g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ea6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1986e62024a55adcc6a34037dfe6a46ef8cc68a5e5112ef94b4318c6fe93a842",
+                        "s" : "0x012ee49bbb3e940183fafe9eb8665501a8b29ee19bf478039be5d36dce54500b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1003g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1003g0v0Filler.json
new file mode 100644
index 000000000..d7b19fe9c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1003g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1003g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103eb6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe6081cdea3d13a3d0319f62f60055f9f1671b7f50ff04ee7202b2221f53ab5fc",
+                        "s" : "0x59daccc1e03013153173602418185bfc965144416e8386dfbd9a7bc62dc9d474",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1004g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1004g0v0Filler.json
new file mode 100644
index 000000000..b266136e7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1004g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1004g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ec6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3bb0bd5e1edf60484d27e7dc234a7d738d10b713c29047b7b93c17469578496c",
+                        "s" : "0x5e8ee8a94a32ccd7833eb92a09077a43ec697377e44f127e4ba0ade0f7ceee20",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1005g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1005g0v0Filler.json
new file mode 100644
index 000000000..4e33de0d3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1005g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1005g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ed6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x275ac3e7ef2c558b6fdd635a78070be697371bbe3c6fb7634dc50effb93a12aa",
+                        "s" : "0x52c9bd7ec2e1158f9f601adab1b1575ab7ee2c2095fd7cad82cf5b78d7b1e45c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1006g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1006g0v0Filler.json
new file mode 100644
index 000000000..91cafb460
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1006g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1006g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ee6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf3914b6ad6874c9f31072639cc7d40df5ac2633005a4ef60d1f54617787b62da",
+                        "s" : "0x5be39c72fa7bcbe562ac7f41e2e1eb08c9c933c6e7f8a75522b130e13dba1cce",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1007g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1007g0v0Filler.json
new file mode 100644
index 000000000..ab34eff4a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1007g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1007g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ef6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc2e81afe133e035fd364560733541d8e8c36b45e4d3960d02259000641b52465",
+                        "s" : "0x06b8e37c83874dc3d670cb0bc1b1334baa490142faa6b586cfa5dda62aacb5d4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1008g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1008g0v0Filler.json
new file mode 100644
index 000000000..fc0290e95
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1008g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1008g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103f06064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb41a858e35005a29012179320bc066b12b48497e930b4640e42deda0bea85d03",
+                        "s" : "0x48b755fe5c65a1a74313340e6e65b905dc215ffa0eef922a60fb9c628454d9a6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1009g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1009g0v0Filler.json
new file mode 100644
index 000000000..a43fdd425
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1009g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1009g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103f16064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0a41cc277324e08b8c2029464634034b17d90d0890e2f673ec857621e4a5cc0a",
+                        "s" : "0x21a8f09c19de2335b31d9737aea28b7db53187a8dcd5d7f59ca5b7e26c6b874b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d100g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d100g0v0Filler.json
new file mode 100644
index 000000000..e4d9670a4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d100g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d100g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60646064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xae8c00e180e169a35fa29647d493a636ada9464fbddb5b2aae5fd0bd90801e3a",
+                        "s" : "0x460a5b3bb4b50e9ebb15c62bb49cd8c914399ef21264cc951d3bd8e506812696",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1010g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1010g0v0Filler.json
new file mode 100644
index 000000000..30c597315
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1010g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1010g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103f26064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x85488e549c9430533d8848d49d13163f285d54cedcc213e3bf055b9d3ca5e907",
+                        "s" : "0x3d894c9ed0ce28d77477ad4477c07e42d88bfa03fb915d0a9095b01f863c645c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1011g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1011g0v0Filler.json
new file mode 100644
index 000000000..bc01df057
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1011g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1011g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103f36064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9a24431794ce253b0a375ae1f0f90cfed95f679cdbbb3e71d94c30b4f80e8ae7",
+                        "s" : "0x0f752341408d5bb885893ab1216a29b7a3974a72bf7b36e2e32cb052f02c956e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1012g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1012g0v0Filler.json
new file mode 100644
index 000000000..589ddea41
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1012g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1012g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103f46064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4604c8235e32127cae48036ea03e5f83cd453f7aa2dd59cc3b497692e9f5e8f7",
+                        "s" : "0x2a5288302277440b75e3106b282e258eeb44c3c4bc5e7bcd6a7f82874be8d5e0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1013g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1013g0v0Filler.json
new file mode 100644
index 000000000..c662dbf5d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1013g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1013g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103f56064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdfc0fe294e7dbf93f212c08c3d3d901a2ec9b26ddceef44a053d970fc9ccac50",
+                        "s" : "0x083654e0dc5fcc517d1b4829b023ad7c52967be2b2746bc727d1a386fd4a3021",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1014g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1014g0v0Filler.json
new file mode 100644
index 000000000..8b719dd31
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1014g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1014g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103f66064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4ca450614131a4bcfecd3b3bb8416e1215efecf1038114842e6c42e12f56c304",
+                        "s" : "0x104356a5993f5e3906b633fa2e50ace17cabea648eee6e4be8051a9e21abb473",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1015g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1015g0v0Filler.json
new file mode 100644
index 000000000..46890f901
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1015g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1015g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103f76064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x75ae6af1c5822461caabaffea24a4062de7d202fd17726d2cf3e2b0d5e8b1173",
+                        "s" : "0x7b7ed0ddd168cb8725e33cbb292b00060c263951c0cd3555d7928fc9adad600c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1016g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1016g0v0Filler.json
new file mode 100644
index 000000000..ddbd92338
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1016g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1016g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103f86064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x13732c82847e0c2aed000a1ed87748e3aeea97374458bbe3c9fc32e4aa12a932",
+                        "s" : "0x21c4eb710b4a34b0f7adb0d75410984487b6b8c923e2c4f9a2e0e3c4a81a0ca6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1017g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1017g0v0Filler.json
new file mode 100644
index 000000000..b23f8e63f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1017g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1017g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103f96064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x04605286c5e0cee130f047d09d3064e6d5f06cd1521ff61ecedee386145a55f7",
+                        "s" : "0x4127a6d2a724ed7d837eaea1a923d7dd0534986998486ab057aad963d24d15a3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1018g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1018g0v0Filler.json
new file mode 100644
index 000000000..4b75458a0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1018g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1018g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103fa6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x12050edc46cf2b34befc768411c093095eb6f28839f922edf906b0da781a9e4e",
+                        "s" : "0x70ff68e0a563874ceac6e2a4175e37d1a40c21857474fabd159371598d26a7ce",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1019g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1019g0v0Filler.json
new file mode 100644
index 000000000..2f6f04126
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1019g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1019g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103fb6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb0301fde9b8f27d9ca4da54591fd1ec4eb3b2d4e689516408068c54c88158b2b",
+                        "s" : "0x2d59c49541cfa3c28c3cd6391859e2b805c3beeea0ebe720dedc64f370ead35a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d101g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d101g0v0Filler.json
new file mode 100644
index 000000000..2868ce708
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d101g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d101g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60656064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb46539e59dced256160b66c7c5db19214c02f7969ee9c6ebd1955f51811497f7",
+                        "s" : "0x50ff5d8c181fd1b515c76964373d9da8397e0ffd3073766c1edba7698e63aea4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1020g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1020g0v0Filler.json
new file mode 100644
index 000000000..8fb5f8f26
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1020g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1020g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103fc6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2e443e0290b4174890b00dd3bc3d317d882ef699cce9c9652abe1b1f1fe29fb1",
+                        "s" : "0x797b0984ef9ddae96371bd9b769f47450ae7a45630b2b993469d1c2d5aa40be6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1021g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1021g0v0Filler.json
new file mode 100644
index 000000000..8cfe44293
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1021g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1021g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103fd6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1b3e2827394f436e32060693387be3603c8b75cc412a79e2902d3939bbad8125",
+                        "s" : "0x6dd130a2861352a3f9c268eba0704297eb931743c5779f973cd911ee6456dcc5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1022g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1022g0v0Filler.json
new file mode 100644
index 000000000..12d7ed6ea
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1022g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1022g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103fe6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x79626595be30fa3b8c47c2d27d99dd4ac2c38a8c323b52480f97c4f374127c36",
+                        "s" : "0x066f39774fa47cc955168d35d5ceb631a9b143366911ee8649b9572550f7ddb2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1023g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1023g0v0Filler.json
new file mode 100644
index 000000000..67e01c069
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1023g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1023g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ff6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeaaddf900fd4ddc014487343f248ab0c08cca8bf0695d49d7d8aebff8aeb67b0",
+                        "s" : "0x6e16c6e44fd3fdb03f15e875b531dc36f603fe3a8b8fa9a99a702b11f6cbe6fd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1024g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1024g0v0Filler.json
new file mode 100644
index 000000000..26c61fd3e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1024g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1024g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104006064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0cb288af0535bb0c1ecdc6407cb75025fd651e529647fcddebeef86a7c5963dc",
+                        "s" : "0x2519bc1f18b23a6c292b0ead899b57bea00df3af9257f500da9d26f38c6fb594",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1025g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1025g0v0Filler.json
new file mode 100644
index 000000000..d38ac4f27
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1025g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1025g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104016064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x99855d5a41436cfdecccc5ac22978999fc836dab18a528e3fee2d18bf6443ed2",
+                        "s" : "0x6a00435ad1e088728b59f21446b9942ef7302cc5a6caa56332bdba6b79a033d8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1026g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1026g0v0Filler.json
new file mode 100644
index 000000000..2cb488652
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1026g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1026g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104026064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9b0d806289e650871fb53c75bb6adf27bfecc8a9e7dde08607ba351f47bc211d",
+                        "s" : "0x0a84fc50cc5ffa34df94437cc512df0982e1e9c1648d0c153049c204a5402fc8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1027g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1027g0v0Filler.json
new file mode 100644
index 000000000..b837216e4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1027g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1027g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104036064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d81b419db93f78d95471235f758dead23d9928b2251f3c6b7654f8e8f77d19c",
+                        "s" : "0x6f93bdde01082424cabd8fce6e91636746cf59b0cb5c94da372f125d023d34a6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1028g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1028g0v0Filler.json
new file mode 100644
index 000000000..b0a3673d9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1028g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1028g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104046064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdb75969dec981590ae784a27d930607162d2c1f76b4bcbaa83a2e2808c8b9dac",
+                        "s" : "0x7f6e86639452d7a0a7dcba4837ba3805d29e81b18aeaf4e3a85f1110fb3af98d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1029g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1029g0v0Filler.json
new file mode 100644
index 000000000..2cefe9440
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1029g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1029g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104056064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4b606181939357f770ff2e02e1593aaf164ddde26010d32878aab306de5f7f36",
+                        "s" : "0x6e1c27541baced7cb7aa54571eeb9825ddcd03a6a70e39e960326f2c387834a0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d102g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d102g0v0Filler.json
new file mode 100644
index 000000000..4e2561146
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d102g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d102g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60666064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd7d2640900fcafc9b51ad520a0b8be0119d234abafea8918c36fb9bf30424bea",
+                        "s" : "0x64495484f401cfff24cbe0441b9ba01f605b78c5c7416eb06295c971fc904a2f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1030g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1030g0v0Filler.json
new file mode 100644
index 000000000..6b09a3917
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1030g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1030g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104066064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x02efaadd64909bc84a25f2f0dfb8b5ed770c1393a3e8df666e4af8763ca2a8bc",
+                        "s" : "0x7744c0ca6067c38ee8eea65aea520987b199c3cbe6d3a1050ed39ee133b9a118",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1031g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1031g0v0Filler.json
new file mode 100644
index 000000000..5e5d37c1f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1031g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1031g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104076064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x05bd4f0f21420806f1375837c73db7a24bd02f223ef9547aa16f2caabcdf8768",
+                        "s" : "0x71e08579ac6ad6e7b4b97304663ce82a06fe9c8ef8c3ae1f313dc3e116394c72",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1032g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1032g0v0Filler.json
new file mode 100644
index 000000000..53a0eae8c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1032g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1032g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104086064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcc7538ea2835713ca61c0b3c000d813c881e346c062eb58a3da344a5d123f9ad",
+                        "s" : "0x26743e4cf4f5e6daaf3b777df4c6f55ad27ae49806454921c053f3d7791021ec",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1033g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1033g0v0Filler.json
new file mode 100644
index 000000000..4b815fec8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1033g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1033g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104096064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x247d2cac0337767991b1bfa06a29445f52d85c6f37d33c8bf0e6557e4b87e016",
+                        "s" : "0x17395a5a454a49cf6dee7750df028608ffb4b758842f5db34e25031fa043d7c9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1034g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1034g0v0Filler.json
new file mode 100644
index 000000000..3456975cd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1034g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1034g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61040a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd70f5ae0f7a5814b85e42227c51a6b4fa1160ccee3d35fc8f702c2c6d81ca8e7",
+                        "s" : "0x6543fad82b4ebcc8693ec8e2b8950125dd5a1810267a5b99adbfea4e12eba662",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1035g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1035g0v0Filler.json
new file mode 100644
index 000000000..b3c2795d5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1035g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1035g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61040b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc14341699cf10b7a49b2d0dc44ae7b5492dd800479862605e9fe1c5de7d065bf",
+                        "s" : "0x12173bac04d7e2a92c997ffa3859274a643cc32894e67e82c5d5706632e2a283",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1036g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1036g0v0Filler.json
new file mode 100644
index 000000000..f8642e215
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1036g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1036g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61040c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcf241254070be26adfb74c3599a36db0adb53d1679fea8623eb3164b1ee25e6f",
+                        "s" : "0x5cad166590b4d7b54a98c0254370d81162a5e0cc917faf7a184edbe451f9dfb5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1037g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1037g0v0Filler.json
new file mode 100644
index 000000000..f17e4b907
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1037g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1037g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61040d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4c0a8402dad1ba026917258cc22862f332ed14c1fa6bc051a53991885466e29e",
+                        "s" : "0x0b750a9f18f94aef3a309ceba3d1f34a27152c7c2b5efdfe7a530fc2260feeb5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1038g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1038g0v0Filler.json
new file mode 100644
index 000000000..b36383d5c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1038g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1038g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61040e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x605461929f744a01dba8aba04f95bcc84d69a17d832c2acba2dba437b1d64827",
+                        "s" : "0x63a627ef5d0c79fc71a8aabf838c734d21cf279101f66cddc9d8fdaa3bb4d0f0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1039g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1039g0v0Filler.json
new file mode 100644
index 000000000..ccd73ff8a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1039g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1039g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61040f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe9d4f11a83f85a26996a4acde1f33b17b8b4e28cc0e928807e73beaf9dfc3869",
+                        "s" : "0x3912e631960b4022100b97642449d0c4847714c1affec803d39d9db5786b3332",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d103g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d103g0v0Filler.json
new file mode 100644
index 000000000..fbcd06be1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d103g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d103g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60676064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf76b569afbea61477cdbe6544668423d673013b633858fd89fde4d1cb40c246c",
+                        "s" : "0x6bbec36aea1792e0e8cc4cf5a07274710b9bb0719452a93beaa7870b3ad7c91f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1040g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1040g0v0Filler.json
new file mode 100644
index 000000000..d029a66ab
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1040g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1040g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104106064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x90920a3de2e6099f08f58ae611c32bfdcf5cd13b15a9564faa9cae8f0ea1b4fd",
+                        "s" : "0x0250031a6b89b4140ed543da59087d0593bf1c88a2d484902c8cb6fd514ccd48",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1041g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1041g0v0Filler.json
new file mode 100644
index 000000000..9b62b7459
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1041g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1041g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104116064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd2da3842ce4e94abb6e9ab4f865999064e782376cc3fb435952ea4ed102ac530",
+                        "s" : "0x35150e017392585a87ad0dfa4cee9ef640b48cad33c45e2b1abb80f331f0c321",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1042g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1042g0v0Filler.json
new file mode 100644
index 000000000..d373f666f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1042g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1042g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104126064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9a11f95e3577bdc72d5aa48e788fc80bdb945c2561b6e6c524abbb17360b488f",
+                        "s" : "0x7e27471d9e537cc2be287edf3675bfd6eeb35a14a28bdbe8e3af47806c49a18d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1043g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1043g0v0Filler.json
new file mode 100644
index 000000000..e07baf14b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1043g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1043g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104136064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x21b74422addd86d7d0873f0449c7941d9823d15512ae255735963852829f0e66",
+                        "s" : "0x122fad4ea6cbe101fb1e96d030b3afe9fa13e2b6e9df339ac3b494cd5171963c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1044g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1044g0v0Filler.json
new file mode 100644
index 000000000..484a7309f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1044g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1044g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104146064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x93da7e87148b787e55087df02591f6ab22b520922fb340af86e80551fc739d87",
+                        "s" : "0x1e22033e3445ee476551c30a62e8567f08abf9100962bfcf7a628e6bb81851e3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1045g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1045g0v0Filler.json
new file mode 100644
index 000000000..3c2b1f5e6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1045g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1045g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104156064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8cb24075fb08c1b5e4294f75ce536919e09acf1857e4c09d552a5801464e8f2e",
+                        "s" : "0x6a617f4312ee7657eedbd98c76cc4e4d0b15826ef26ed5d6e6975839177b961a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1046g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1046g0v0Filler.json
new file mode 100644
index 000000000..e32905cf1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1046g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1046g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104166064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5b4950765ce40610632cd3c4d55722fd6323d849301a61a9e2408a7397b8aa59",
+                        "s" : "0x5dc308501fe52009ec8221792b564dd36382c3730b3d18de195b7e0b91fa8038",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1047g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1047g0v0Filler.json
new file mode 100644
index 000000000..6fd343fb3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1047g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1047g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104176064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x977f1528d741f2bc1a06cac26542ed24ad24adb31f2a0a7be24540f3bba863d9",
+                        "s" : "0x6eab5c2578183da876b0bcb7b90d48763901f53f3049d401bb41b8498841d6fc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1048g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1048g0v0Filler.json
new file mode 100644
index 000000000..9ab6d8cd4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1048g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1048g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104186064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa0b998d37b310d3a3ff624d292e4cc61723e985530d95e94d6e7d64a998f71a0",
+                        "s" : "0x4d88d5305fcfb11680d89824474eb5bd408583271a572a56c2cf66f6de369a96",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1049g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1049g0v0Filler.json
new file mode 100644
index 000000000..4d17bc2f9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1049g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1049g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104196064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xce304ba0dc755167f944b7ff5e8c3351f15fecc9514db25228f363b53d51b8ac",
+                        "s" : "0x1f770c61668c016a306b2ad73368a6f79467b9200e8ea417949fe640538aa8e6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d104g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d104g0v0Filler.json
new file mode 100644
index 000000000..746e562cb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d104g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d104g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60686064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0231a364b1112c9372f2e54cff87d42f8be95701103e20c6dde2a8cf4c716d44",
+                        "s" : "0x5ad1ff1ea45d20a26e6b8b288872bab56cd5849a6340f7081844d88848887a79",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1050g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1050g0v0Filler.json
new file mode 100644
index 000000000..12b0b0bb7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1050g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1050g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61041a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5abe53f957ffbc79571af5b3124e41bc4e102ee878dfa22d46deff39b838fe78",
+                        "s" : "0x3776879598239304110273c5910411ab26fcdc00020d83385768850432aba3ea",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1051g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1051g0v0Filler.json
new file mode 100644
index 000000000..ece3fcd2a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1051g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1051g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61041b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xed3bd8470cc79ff5da86f1d6791d97740f552fa2a8b6a108cf24fcf4635eca96",
+                        "s" : "0x0b1cbc54327fbc591589f5e56723d903ae8163fb0d448398818a10b628e31f5e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1052g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1052g0v0Filler.json
new file mode 100644
index 000000000..7a1d3c45f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1052g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1052g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61041c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe1e8bca2f73a93fbd6e8d4572ab8d765686ec458d41fd8a5eec7b52e47b70c4f",
+                        "s" : "0x7bb4885f9eb7bb36764ea42ac50ef5c3f71a44ade966f8444c8aaa225f00375f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1053g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1053g0v0Filler.json
new file mode 100644
index 000000000..fe2f45252
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1053g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1053g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61041d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x55810dcd04b56c14f0f29a4cdeb33f1db2dfbd1430fb2dfb98f9c53fd48fea17",
+                        "s" : "0x4633dbf13cf3dc0c79e104a26267ba80dddc466f83c114592a6636b8940261a2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1054g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1054g0v0Filler.json
new file mode 100644
index 000000000..43094f5c4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1054g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1054g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61041e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbee156a65d32b0f2101a658a79e795ee8307f6bd9eaff373d8b8f23b588b4917",
+                        "s" : "0x7840a270775b31426dd37bf2db5edd9ee43c36444cda239837185db47bcd6776",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1055g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1055g0v0Filler.json
new file mode 100644
index 000000000..aada62b12
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1055g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1055g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61041f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82d0d8a4e3ced155ebba6ba41cbd6bf391c5da2ea6e37d64a3a7c7263b0fc130",
+                        "s" : "0x0bf8f0c00d92a811eade739f17fac65263f32a885fa7066b125a202bb1402096",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1056g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1056g0v0Filler.json
new file mode 100644
index 000000000..b58be3dd1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1056g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1056g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104206064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x63242df49af2498920e1f777e05a5ec4762d1d7b0f971bc288debf1118b0a035",
+                        "s" : "0x77e58216707aafe217aa443ecc2bea041a92d3d40f0ddf4697f8f22a46a91dda",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1057g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1057g0v0Filler.json
new file mode 100644
index 000000000..94787ca9e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1057g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1057g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104216064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6783d385da0e5388344f1e17dbce55232e29769cca434905e743f0b438d52502",
+                        "s" : "0x5250024dc7bafd333742a2f91a5a970065d00cf6646c2ebe0d6be91ec843b66d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1058g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1058g0v0Filler.json
new file mode 100644
index 000000000..baac6c418
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1058g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1058g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104226064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x073ae77f5ccadd9f5b4bf013c626225508cb723558ef1f7f0db01fcd8c07ea6a",
+                        "s" : "0x19e6a95050d6148f5d935638880f08e9712d3a7f309e250c550f1ea67bd1e245",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1059g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1059g0v0Filler.json
new file mode 100644
index 000000000..8e1c88c68
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1059g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1059g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104236064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc66b2eaea702fbeb1329d3ff9fe7d55d2b8c57a8c6d6ce23d3e240483dccd7ab",
+                        "s" : "0x44f215d24334e47e9a83a2699e121e60c74d1834800e18bcbc3713de0fac5050",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d105g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d105g0v0Filler.json
new file mode 100644
index 000000000..5c188cba2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d105g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d105g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60696064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5290923623d09e1780cc732b786b972c216a0af6a02f8c9bcabcaa7f639dbdcd",
+                        "s" : "0x6fbb512e99169f0d41e53cf45a4651480425037021f066b20a06701fe5ef0ffc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1060g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1060g0v0Filler.json
new file mode 100644
index 000000000..199a9ef68
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1060g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1060g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104246064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb7dc490a30effc63e27b6b7c646d6700b7cf9888ddf463a0ab532e3098e0d69b",
+                        "s" : "0x53367d712b5c017bdb71ca462c6190d6864b6767af2dab02f25b66e47c65b15e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1061g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1061g0v0Filler.json
new file mode 100644
index 000000000..8f37a957b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1061g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1061g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104256064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf48938c0ced7f01cf58782e1ca857553a4ecbed021bbd88d2aa0753c80bd6d95",
+                        "s" : "0x5641430f4d6dbd7e99a36e84c9becba841f19b95d114997fce4b36512f97f8a7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1062g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1062g0v0Filler.json
new file mode 100644
index 000000000..15807100c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1062g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1062g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104266064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe0341d4d85a46a1f6afd1502a20142bf3b2dbc92f7f67b5df8b2747eeeeb9235",
+                        "s" : "0x665b258e0161ac16f0e9fe7d1af342f6ae45c6855f5faad69873af8564eab65a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1063g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1063g0v0Filler.json
new file mode 100644
index 000000000..99495cc6e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1063g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1063g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104276064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8feaf8f1e643fe78836e1bcf3b27032f5d7419b9bf6adfad562764e9f16661d5",
+                        "s" : "0x6866fc7abb1985d8cc2af2181b458c4900f68ae61a2208b8f905a4beed21f2a7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1064g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1064g0v0Filler.json
new file mode 100644
index 000000000..d9ff4e9dd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1064g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1064g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104286064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2b236d54061577e78845688b2042a59dc594e3768d2b5b4065b5650a2a46bfb2",
+                        "s" : "0x7952d77706132fd10b33ca62acf9739b2e12a0074011df20aa7cc0fe0c6c0cbe",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1065g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1065g0v0Filler.json
new file mode 100644
index 000000000..fa5ffad32
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1065g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1065g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104296064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x47294a1a6392236f8399fc3f11f439de420c4b31624f90a8c76074fde86aa6c8",
+                        "s" : "0x3f4b4cdb85ce43205245ca0040638db8b97dc27af6fc1272c6ae27a1c95b7c16",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1066g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1066g0v0Filler.json
new file mode 100644
index 000000000..95d7fbeba
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1066g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1066g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61042a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc4dc5f9b80e8065b6920a7d1f489602fc6e95a9c3c77bc979b363b074a119074",
+                        "s" : "0x2bec83533271ef1bf341ff6004f5c0b8998b52fb6d0fe328351cc8b5ed759f65",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1067g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1067g0v0Filler.json
new file mode 100644
index 000000000..e12331ad4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1067g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1067g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61042b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x923a4b22151e57d744c07cc509db9ca7e54dd7d47cf2c69afa25afaba9959f80",
+                        "s" : "0x4c76c7e7b44a4a6913a52d7ea06b2ba7ec432a749593f253cc94f3eb7c289858",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1068g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1068g0v0Filler.json
new file mode 100644
index 000000000..cf4dfaa34
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1068g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1068g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61042c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x13d5c7369d8be8b5eb07bdaa11eb4c8033a8e2425d26dd4a5d18d9a28a705f4c",
+                        "s" : "0x5d70a61a467466f1649407f75e65987633dbebdaadf44c1b7284a67e4ab289b6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1069g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1069g0v0Filler.json
new file mode 100644
index 000000000..e67732536
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1069g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1069g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61042d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3232a0506b81846d89b2f37d6f9fee0973b8d7fbf3af7ccf4b6481840ade2cb0",
+                        "s" : "0x0c39d9ea0c346242186f5aece46a34e5b099daabf184cddcbd0744fbe59d669f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d106g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d106g0v0Filler.json
new file mode 100644
index 000000000..86aac0d14
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d106g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d106g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x606a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb4758034092787bed4cd441a967c4503cd9f7157b09a27cd108e0b3538be7040",
+                        "s" : "0x387a394256d096bb9f25c1f23a9d790f48b4398cb1517e12d9668b795eef348b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1070g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1070g0v0Filler.json
new file mode 100644
index 000000000..44c04acba
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1070g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1070g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61042e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8fc0b9e8dcf006eea51b30455fe447be1bfe3d52986b6cab43709c3d3840faae",
+                        "s" : "0x64763ded838486e2944d5cd9eef1aaf2acc9d1851b3024754a2884b2b27ca387",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1071g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1071g0v0Filler.json
new file mode 100644
index 000000000..2975d98d3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1071g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1071g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61042f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7ec2ac86268ddc3b218f09e8a2c4e04c79743e6c81c4da8737c76228d7b49941",
+                        "s" : "0x448cac9ffbd75ef0c47e9227fac3ed8dcb885a4a7fd47d6f666924c7fdf89473",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1072g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1072g0v0Filler.json
new file mode 100644
index 000000000..417944178
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1072g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1072g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104306064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6923159d38ce0cf301f5ddb4131c7813b25989006527423e8ee6a6ebd114b287",
+                        "s" : "0x519286865c9c2ee58ffc2be3e5956e5ced3c22f7483b5c9c7e4baa92ebfee2ab",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1073g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1073g0v0Filler.json
new file mode 100644
index 000000000..bf3cf5e7f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1073g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1073g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104316064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4e084e09687ea2f842e4d9618828d67a8f7ee11bd4b4841bc5e719b26992f9f5",
+                        "s" : "0x047565dfa958e8f52cc7a774a093d40a530bba8a30e09007b4963b871ab08655",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1074g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1074g0v0Filler.json
new file mode 100644
index 000000000..a42fc5fa0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1074g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1074g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104326064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x903d0778d66a86271681ef76f386fab0269ae7c117cfc36fe14bf3763436ab9a",
+                        "s" : "0x11d78996ea5326ee6bbabe9a703f1b2fa84b2b2bf2d23571f5f8a19cd48c92ec",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1075g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1075g0v0Filler.json
new file mode 100644
index 000000000..48aa4c38a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1075g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1075g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104336064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x812f98ac1f09ee134d4ef0801740546d8cf78db9ee1f0cbd14b0087dcb5764cc",
+                        "s" : "0x5eee6d710e71422db62559b2042e3cf35d5c669c3b6533ac770979311167218e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1076g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1076g0v0Filler.json
new file mode 100644
index 000000000..1a9622101
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1076g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1076g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104346064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x75f7f4537421c2424b4e04042e4b3137c377391ba19c378621d36723689cbe47",
+                        "s" : "0x1dcf874261624a778b4d83080fcfabfb22443b4c0174fcb537d26a6910c39126",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1077g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1077g0v0Filler.json
new file mode 100644
index 000000000..250c28da7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1077g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1077g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104356064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x70e57ef17b7590cd99bc5c916dd4af947d36caa7e9b1e55b58d83c3ffc61f19d",
+                        "s" : "0x44ed1fd21afbfa2097e90051b409a45d87ef3bb2dae99b45ae059a189646141a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1078g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1078g0v0Filler.json
new file mode 100644
index 000000000..c91f66f00
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1078g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1078g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104366064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4c5cb7dd810901a0baf6a1d67e92d651dfc78e7b8051037bf408507df2017544",
+                        "s" : "0x2556e8a996ccee7a35d30f7d5e093e846dbb594d47a45b1084e3de5c828f6ab4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1079g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1079g0v0Filler.json
new file mode 100644
index 000000000..5c444226a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1079g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1079g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104376064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8f424326d9cb6840495c3d4fafbfc0f918157adef2edcf29d421c5aed008475f",
+                        "s" : "0x3ad253b1d6148da7fc460320600c0282f19830c0b4e1cc980565ccd79d3030cf",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d107g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d107g0v0Filler.json
new file mode 100644
index 000000000..b5f4003d5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d107g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d107g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x606b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb040ed709a32c4949b28edd5e294889897a5c6d259234c4310bd5e504cb03529",
+                        "s" : "0x6094a67c9ba8e2162db59d86fd1e28640f376ab7814e19bd48fa8be116136e6e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1080g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1080g0v0Filler.json
new file mode 100644
index 000000000..957540af4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1080g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1080g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104386064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x70398830ca0d1714d69a5caca11d130f5987f1156ad781c2e5e2616c1ea07319",
+                        "s" : "0x3c41b220314e9b629602d1fb72d714cb814aec6732c6f6f4a59ce25ad38d2d51",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1081g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1081g0v0Filler.json
new file mode 100644
index 000000000..862c0fda8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1081g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1081g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104396064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x33f4ebead2d40088473d2d12e99fd29935c79b609fc08368763ab35f727a5388",
+                        "s" : "0x3450cffe20b2b2967f5a2502a282a0f827836acd989d500eda748fdecad7b837",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1082g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1082g0v0Filler.json
new file mode 100644
index 000000000..36fbae938
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1082g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1082g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61043a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0f308e9b8553112dda5bbeb5f3af98e4649987190b5ed6517a030f22d6e78279",
+                        "s" : "0x375ac185800fbb6555755a445dd451b506512ce043e8e8b3cc4aa0b86c7235ad",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1083g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1083g0v0Filler.json
new file mode 100644
index 000000000..9c9cd28c7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1083g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1083g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61043b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe17394636a3a7d654e5e00c1e407b7ac11034d164f1a47c49e12625a331a3f43",
+                        "s" : "0x2e88f9682acd5f61c75dd2b59418174616ac19c800783a5b3bc82c24d29935ea",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1084g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1084g0v0Filler.json
new file mode 100644
index 000000000..d1aea5064
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1084g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1084g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61043c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x69f72d8e1b058adb1fed45aa8f8c80c6ddd010affdd1ed8e7f0325ca3d09ac1f",
+                        "s" : "0x16d1ed18b003e9f847acfe2f414340025949e80e25156d8ce5562c1f5e6e7cfb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1085g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1085g0v0Filler.json
new file mode 100644
index 000000000..256c390d5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1085g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1085g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61043d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x50820dd260690b202a4855dbe6511686460c19f2aec649b579e350e920f56393",
+                        "s" : "0x4eed7932412c1fb937e31df21f71212ef3d7a309237b74cbff3a244421a48dae",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1086g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1086g0v0Filler.json
new file mode 100644
index 000000000..93c0d01aa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1086g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1086g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61043e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdbd1d0297056498236accb82f7d59f6844e6fd1875409c4b70755456d472c6e6",
+                        "s" : "0x491676cadb05769ce455f9e00255c416e9d469f3e2bdb16c13985d661505d05f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1087g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1087g0v0Filler.json
new file mode 100644
index 000000000..421601770
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1087g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1087g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61043f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x32a3c41099283c631f26398888d6aa05be1bbb5dbe1d7a63940bcc9540f8d45c",
+                        "s" : "0x51f0cdf45db49f8cbc003317b7d22858638bb87e95389c4441f458bec10fd066",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1088g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1088g0v0Filler.json
new file mode 100644
index 000000000..c554f9112
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1088g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1088g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104406064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbd7f8bafd1cead60c09cafd620defce7c574c5e9e45a5b795c92213f582c2ddd",
+                        "s" : "0x02ab5a23ee9c278192fc777e4547424eedd66b20af8b4c0fe9068ccd72aa446c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1089g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1089g0v0Filler.json
new file mode 100644
index 000000000..eae552ae8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1089g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1089g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104416064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x58b8e4c380c87cc70a923c1c15b98fcfa4658cc47ca099466100ade28e9252f0",
+                        "s" : "0x2035da745949852681fb6c27f0d1b8a3c4d0b0ecfda0a8ca6ee0ca8a95a518",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d108g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d108g0v0Filler.json
new file mode 100644
index 000000000..cd2ea2dbe
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d108g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d108g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x606c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xed97ea3fbceba1901884e333a717964328103b13304e991c13a1f8c66ff7ce2a",
+                        "s" : "0x2ead141f0b1ad7e9b656c48480fdaa247fd9d5b1f0ed48a6844c52de87b072d8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1090g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1090g0v0Filler.json
new file mode 100644
index 000000000..e6baa7cfa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1090g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1090g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104426064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc340a9e90bc182d6297dfbd1948d429e2bbe9150c972ade95a480f9d32eba949",
+                        "s" : "0x302848569198d518b38429290b832276abe6fe59af8d2a98846148a0416e3c96",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1091g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1091g0v0Filler.json
new file mode 100644
index 000000000..3d9d90ed3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1091g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1091g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104436064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3c86db4978336c6a26da4d8cf2f58d2d583ba2ec9bad24716ae25bfa45bdc491",
+                        "s" : "0x43f7ac49edb734140c1599bafd97a5e65e107af4dca3f3c8b016224500e0baad",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1092g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1092g0v0Filler.json
new file mode 100644
index 000000000..efb17354a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1092g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1092g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104446064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaf34c1f2818227751ed7509639310f248a48c5b7355584914b8653b9f8b79038",
+                        "s" : "0x3685934b9042e426b51b46624a5eafb07c8e803673b186ffd1e04ba8c4c63091",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1093g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1093g0v0Filler.json
new file mode 100644
index 000000000..392de3075
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1093g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1093g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104456064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x112e9f38a09610d582bc887d4084b079f9ba5f179cd6b50f7701298a997d9b94",
+                        "s" : "0x3097846e49e0186362ad52d8c55719d998bc52a59e9968e39a18548c356ee03a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1094g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1094g0v0Filler.json
new file mode 100644
index 000000000..8f4f57a74
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1094g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1094g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104466064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0332849e70c98064c5cc71cb299911d2dfa84bf7978594d819ed6804c1e5b5f8",
+                        "s" : "0x09d774b0303530316ac40d622942bf5e4f2d14d408f6aea98d9e3664a3dd1534",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1095g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1095g0v0Filler.json
new file mode 100644
index 000000000..cec75c5df
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1095g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1095g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104476064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1ef95c1e1ba0caf90d1d2577ab12861acdb105337cb7e1dbb448627246305330",
+                        "s" : "0x36fc31670b2a6d9e2318349c3293e87d984ec068168effd0374866d8dcb5d5b4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1096g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1096g0v0Filler.json
new file mode 100644
index 000000000..c046748dc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1096g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1096g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104486064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x36748f57ab1411d8c4b9e5e12fbfc1e96feeca3dfeec2601627844bc2c4993dc",
+                        "s" : "0x3961b8526914091408a29b6e05e2141cd76fad9a0f1bc115a51552863d328165",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1097g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1097g0v0Filler.json
new file mode 100644
index 000000000..10034236c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1097g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1097g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104496064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xda1eb40006cea7798087c1fd9fc398f75e421a2299d6639d546fd6c3bbfe92d6",
+                        "s" : "0x6736ab4343fb2a86e64d37844d84e139dde2a2c715ff407d2a3f19586ced433c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1098g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1098g0v0Filler.json
new file mode 100644
index 000000000..99d6d9883
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1098g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1098g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61044a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x24e988e538a9c4d3d3790fdb9600a7dac5595c1c611f124b6fd9542aa14b1972",
+                        "s" : "0x3cb26a0e2f047f0a47b1a69e72a16aa5a767751d6af0d0228a8a9a73f6b7a0ad",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1099g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1099g0v0Filler.json
new file mode 100644
index 000000000..b91522bab
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1099g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1099g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61044b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x29720a719767bd5f50b15b9989851a0c011506de26528916c60322068d9f77e1",
+                        "s" : "0x7fedfb2a56ccdb1fa1ff30ca5068b41c5270ba6ea4f86084199116958f92acee",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d109g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d109g0v0Filler.json
new file mode 100644
index 000000000..42b766833
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d109g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d109g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x606d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x359c2db3d17b78f4612920f367a853309ab1aa5fc1fea79a553c564ab4e680f3",
+                        "s" : "0x426a59fd41f5a89d395f96031ee79e79e2832faf9d4bd946bf4e5e9f2fb21493",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d10g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d10g0v0Filler.json
new file mode 100644
index 000000000..1cbc24b34
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d10g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d10g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x600a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4fbff08d6c6c9ce267b2268e57104a129785e3e2324c4d21bdc5102ea296e048",
+                        "s" : "0x6a387997b87c7595121c066f2771cca9cef9a2fb97effa2139944c7612bc8c54",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1100g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1100g0v0Filler.json
new file mode 100644
index 000000000..fefe1284a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1100g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1100g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61044c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x897e17331e3ec458613de4f1e1321c62639b4c07798fbc14998f4228f2fd3b43",
+                        "s" : "0x2dec83f18784ec79cece0b7a6b5fbd01b7d6206f4868c7cd48948adbe39fd226",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1101g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1101g0v0Filler.json
new file mode 100644
index 000000000..66e5fb9b6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1101g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1101g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61044d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xea28f086a3afdefaf3c817b8897e4dcc4cf556517c13533c639b7413bc676831",
+                        "s" : "0x2473eae055bcd764c5bbac973fe9efc685dcc31a3dcf76ae97ee07ed266eac6c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1102g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1102g0v0Filler.json
new file mode 100644
index 000000000..5d0652a4e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1102g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1102g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61044e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0dfc073e3357283ffecfcdcc7a84a2dbbe20a010aef60f9cbfc21160c488592c",
+                        "s" : "0x6cbe4e8ff70477353b05357889e7e7fff482b95b44540ddb5c5b9387f8c557b0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1103g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1103g0v0Filler.json
new file mode 100644
index 000000000..b7aeb8a0c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1103g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1103g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61044f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd3d7c2e71cb2d0c7e11e5243b5c9babd9b1ffa35ead4a34a99b08acb24399371",
+                        "s" : "0x51aca6b115ad48da96421689cfd9235e35cd068118a734aa933f0b58a31fe8ad",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1104g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1104g0v0Filler.json
new file mode 100644
index 000000000..a21b68f0f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1104g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1104g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104506064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf4ef9615c42356241ebd61bc8640015289e7ffa168a1abe2905ee2da27fe7f4f",
+                        "s" : "0x31314c67a92a0f8f5713108205283300dacd090519cf83d40d78e98441eceda9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1105g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1105g0v0Filler.json
new file mode 100644
index 000000000..28f62bb35
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1105g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1105g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104516064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaf035da54355ce62ccc22c50e9ddb679876a7eea804b38260cfdc98ca49ba313",
+                        "s" : "0x60da3c0ed54484e4ac25f72b2b6605a7df06e9be517a7189284874afeaf0c360",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1106g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1106g0v0Filler.json
new file mode 100644
index 000000000..b33aac665
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1106g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1106g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104526064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xca7eeedac7e9deee861056be4e0a4efba0bae47b4d030bfe2762795371a3b4db",
+                        "s" : "0x5d1c7225cd562d5ecfbd8c9315342ae5340676b04337aeb280ca2ccc6f33ac78",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1107g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1107g0v0Filler.json
new file mode 100644
index 000000000..cb12e37ea
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1107g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1107g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104536064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf3a41b7514acd776e710849b966cb0e6cd8bff3f04e49269326f9a0ff8ea2f03",
+                        "s" : "0x1433b15c49c2dacc5fdad3c79bfb92c9639dd8bf4127228187be098946b42021",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1108g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1108g0v0Filler.json
new file mode 100644
index 000000000..68c67b03d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1108g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1108g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104546064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2414003126147a7d99ff3e2d2da0199a57f8fe6f6ec0679b9a5a46fe049666de",
+                        "s" : "0x727bcec900dad0b6899a4ef9bda3bcf2acaf043ecae7b0f02852d5064bab6a79",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1109g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1109g0v0Filler.json
new file mode 100644
index 000000000..f53aa07bf
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1109g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1109g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104556064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x79347b141e3c84469b159e0e6230ef57b50c0520b3fb37292c980e9e1d319f86",
+                        "s" : "0x36102a2eb960bf940500296b805ce92e75cf9bf1a3668d6c08fa0597fb0ab84d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d110g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d110g0v0Filler.json
new file mode 100644
index 000000000..d2c60e7fc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d110g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d110g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x606e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2154ec5a31d4db49858561ffbbef03a287c67c9b68d2a9fa7c043ff8d021a9",
+                        "s" : "0x6f6f84d138cb6f9818ebd29469c1db905810a4701e2b35b97656957023ece62f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1110g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1110g0v0Filler.json
new file mode 100644
index 000000000..c89f3a2e9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1110g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1110g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104566064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x95f542fae217921629e23e1e7093f3dc7b508e816fc3188065724ea28ceba7c9",
+                        "s" : "0x57d8f0192c054806d537f508e71cc61b5eff5aad6d8447d519aed1e18e27fac2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1111g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1111g0v0Filler.json
new file mode 100644
index 000000000..9e20bc6a4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1111g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1111g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104576064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbbb33bbb729f5881720306754e6c8d14392a02811777959cf796cc1062dba400",
+                        "s" : "0x683178887062a44933abac6abafd545e78726d0411355b4c4d0a70791fedb050",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1112g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1112g0v0Filler.json
new file mode 100644
index 000000000..bba0402a0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1112g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1112g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104586064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x56f1bf92de2f38e528bf20bf23e3756eafa58e87fbea91fa57f414981fa7a5f0",
+                        "s" : "0x1a418e4de434a8f77738bfd6fc500cdae60ccb57110be068f5808c31274152ad",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1113g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1113g0v0Filler.json
new file mode 100644
index 000000000..c160e46e6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1113g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1113g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104596064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1197981580a2305150fdf643bc12daa8ccb2c4bf3cc7f484a124bdfa0b9f4943",
+                        "s" : "0x1828263c66422524d38af6790e401332aec52ff14a2f99d5d2e74278cb5d43e1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1114g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1114g0v0Filler.json
new file mode 100644
index 000000000..05ae25d00
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1114g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1114g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61045a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5a8f7aaf2acbb63d5a0de14d34cfa20b6240b277a751a5a141ab4f1f3445d7ae",
+                        "s" : "0x13054d040be506cb915a2c915c66354a4fb75eaf50dfeaf5eb511d0865b85ce2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1115g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1115g0v0Filler.json
new file mode 100644
index 000000000..3cb0c9646
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1115g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1115g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61045b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x21593320ebd8ed2d96d6bbeaaa43a1f2ff1fec15b52f3b120aa83b481cebc5bf",
+                        "s" : "0x52dfd80ae425577329c31d73bfcbbe70c31907dd71269aec7753487f11012843",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1116g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1116g0v0Filler.json
new file mode 100644
index 000000000..5cb617038
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1116g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1116g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61045c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6d77c2f5a341c7eccd4dde3ac4bbe825be02027511445d996528af4612f3a91a",
+                        "s" : "0x52d522af1595874605cef5677e8824c3302c91d240719118ef7a913f3f631983",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1117g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1117g0v0Filler.json
new file mode 100644
index 000000000..27c072c51
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1117g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1117g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61045d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x15da93800325045b4924fc74185dc344e1795415d66177b5cc676768b4fe4a75",
+                        "s" : "0x1f522767c8fca7de828501f6dff9ccafb44872e4b8ac6b23478ef77547bae270",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1118g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1118g0v0Filler.json
new file mode 100644
index 000000000..35347bc56
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1118g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1118g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61045e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2bb191633e0d05c66f331f973712157690f014854eab72cb90e12263faf3d4e0",
+                        "s" : "0x5bba4dab23414900c8e2e966869ef9ff57600dc86708faf168dbd5499253ba17",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1119g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1119g0v0Filler.json
new file mode 100644
index 000000000..3c00aa1ab
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1119g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1119g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61045f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x17c319bbe9215ac07c1e75f69b006d50f730034cac8cd08f94d4f36a6c071131",
+                        "s" : "0x0d7b69d0c6b4576e100ab5bddd6e1eb65d83a2c7bca4618973810a8ab0022b27",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d111g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d111g0v0Filler.json
new file mode 100644
index 000000000..3f60665ee
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d111g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d111g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x606f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x51578ce18b39f660d794324ba8ab296342b686114565f4d3100586b3b9d94e6d",
+                        "s" : "0x37e9a2415f3771793a0b8b4cf88b07767540d893d864fd07c4a3091129e949f2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1120g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1120g0v0Filler.json
new file mode 100644
index 000000000..c408b93a5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1120g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1120g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104606064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcd4b082af8ca50cf64afc99f368e1cb013b90de326ac54e1941ca59e1712fee7",
+                        "s" : "0x1600dfed9ebd1b79b186357d22e9a8ff97ca6111c67ebe972fe07f1083e5cac8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1121g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1121g0v0Filler.json
new file mode 100644
index 000000000..933a4212c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1121g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1121g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104616064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1d246fdd55f4b8920e586f8a4ca87b7dc02e04afad842d316e22cfa98844892a",
+                        "s" : "0x0538c9f38f03172ecbd92f3139a1eaf007f28e40710afc5bfd1d9979b2b195b6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1122g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1122g0v0Filler.json
new file mode 100644
index 000000000..626396a0a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1122g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1122g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104626064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x16c835b4003f92ef02b370234632975dbb238be3fd481ddf1252e36e16575a2a",
+                        "s" : "0x191e03f4b329938a9c977a5eb1153d1153239f19b50685be525fd1e3297caa7f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1123g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1123g0v0Filler.json
new file mode 100644
index 000000000..b8b43cb1e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1123g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1123g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104636064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9beefa865ae2b4e005654c2ff914a35a32572f831e545fc59b6360cc3b30742e",
+                        "s" : "0x1e85ae70b8c8f2b62748641d76bc7c87e58b83a9559de6ef93aba1369d50fb01",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1124g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1124g0v0Filler.json
new file mode 100644
index 000000000..9ded8a9a7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1124g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1124g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104646064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8ec987842b5ce734d2f8768fbe5b3f3442425b61d5389866b7fa0f8eb091f2f3",
+                        "s" : "0x04019e9adf45b2325e5c4f16f733a0984441681e745b12a875f15162e8008f9c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1125g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1125g0v0Filler.json
new file mode 100644
index 000000000..4024327ba
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1125g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1125g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104656064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf9c7239c27983af1f37f0f6d377ec301f5968442e54ad865e9c30ac3e6043b58",
+                        "s" : "0x409a42f16e6f43529de406d496d93c7fa0119dbfc7ba0b8a8b2b9d870d70621c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1126g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1126g0v0Filler.json
new file mode 100644
index 000000000..3d3e2b78b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1126g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1126g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104666064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcd53ccb57c506cb940c20eddb2a7f38364d5259fa05ebe93e94238cf4f3f3dea",
+                        "s" : "0x371e1894c3589fd157fbc12f5ec0888700ba33ae306595b6d80898b631079c8c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1127g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1127g0v0Filler.json
new file mode 100644
index 000000000..085509554
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1127g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1127g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104676064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd0ac73fe595b7e9e21ac3ebdaa9fe8edfce1f87c11f50e8077c9357ca8616f22",
+                        "s" : "0x2e6c6570243eefbb80389328d1d885476324c5804c75bcbc59bf4725c2bffcc8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1128g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1128g0v0Filler.json
new file mode 100644
index 000000000..4ca2ff443
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1128g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1128g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104686064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x22b1fb1f1476d8874808bff851a3b3a179127d234c5065464a5ad27d7bc1a6ab",
+                        "s" : "0x0fa468c96f0d72ab16b99a512db57d0eaf6e6a28662276f6f15b22c97ac0460a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1129g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1129g0v0Filler.json
new file mode 100644
index 000000000..29051a4bc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1129g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1129g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104696064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa1780f6c4b99201a8cad178854272c2755b70269e0d3497078804c3e80395395",
+                        "s" : "0x4a0cb577a6a05750fa4cb8a15e858963a0c192b3db01adfedd38202cf5c16c3c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d112g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d112g0v0Filler.json
new file mode 100644
index 000000000..ea4f6fa08
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d112g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d112g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60706064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe4c12c3b70b003ad5e378658ac6c44924c8158f23aec9b035d5978d174a8ffb0",
+                        "s" : "0x3de160d14af33dff7cb3a5d3d842a3b50f60f49e4648e4affca15db2b9e09162",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1130g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1130g0v0Filler.json
new file mode 100644
index 000000000..ca84be055
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1130g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1130g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61046a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8255c340c746307ed72e80d37575c28474e54f17bbf7231e52507b8e754fbce4",
+                        "s" : "0x5f70aa4fbf9501ed16fe43c7d918771efc1be45ca94b78d12b246e18265adba1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1131g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1131g0v0Filler.json
new file mode 100644
index 000000000..40d4f6054
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1131g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1131g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61046b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x19c77cdf0c44508bc8fbc00aad3653a38def03a48b9a1d2033cd411f901d9eb1",
+                        "s" : "0x14aadf33d4f8be7edf899ac904e82570efed5df6866d3e129281d642d0a1b680",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1132g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1132g0v0Filler.json
new file mode 100644
index 000000000..2aaa53fc8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1132g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1132g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61046c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2367f8a10ba48344f20794999e467da9d262646c0b1f56db145571c6b6a5c66b",
+                        "s" : "0x3fce852a64d548dcc300cdf41a6c2de3463b297c943196c3078296159d04fc26",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1133g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1133g0v0Filler.json
new file mode 100644
index 000000000..e7407d355
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1133g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1133g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61046d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf2227877b6a050d5f064e99c927d67add742925f72eb3de919bdfc94fa0147ff",
+                        "s" : "0x69bb8e389ed98f28d3fb31975e4d2a2afe48daa1838863e52f29ea2c3df69b61",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1134g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1134g0v0Filler.json
new file mode 100644
index 000000000..f6f13df72
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1134g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1134g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61046e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4895b3706098a44b605a981ebc5a64101e86f2aa12d361dcc0d90843ccdff0b8",
+                        "s" : "0x2c4b9123da926188e592873afb3c2a350b1c66b4cac3e197a8dba93337d97413",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1135g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1135g0v0Filler.json
new file mode 100644
index 000000000..ea67ece78
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1135g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1135g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61046f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x952569be7d6996d958e0a7857d118320750cf37ca0080487dfea4cb33b2ec5f6",
+                        "s" : "0x640a3eb6ac99e5061926c2495110c12d848aec36571a46d020b89d04c33bd956",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1136g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1136g0v0Filler.json
new file mode 100644
index 000000000..d0179a243
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1136g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1136g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104706064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9fb2579f5091fb15e44d1cce127a54703a04af2559ad995bbeda7f788a0f4f3e",
+                        "s" : "0x17f51f995c94ecca23cc5dc950ecaccc80ece43de800e0c0f791bdfc51b485d1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1137g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1137g0v0Filler.json
new file mode 100644
index 000000000..620234255
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1137g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1137g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104716064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb0b7bea36cea984875d8dd89006587436f8c9b5c9dbb915cb73fca5369a86db1",
+                        "s" : "0x5417a3987df0a3deeae6e08affb32f7c86dc2502985407a6ba38169012ee7bbc",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1138g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1138g0v0Filler.json
new file mode 100644
index 000000000..e17d1caa1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1138g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1138g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104726064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x99f9c496b9b03107ab9f456a3f5d00e6f31e6446af527dd047ab5f758232943b",
+                        "s" : "0x613f57e3433a81c50cc803f20e6121d14400e82a2a59e4a282ad748e4d4253d9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1139g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1139g0v0Filler.json
new file mode 100644
index 000000000..218189053
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1139g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1139g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104736064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x859f92a6c8a1ac9c2ff026e7a8fcff055f8490880c192e6826bda5db94b99d6b",
+                        "s" : "0x6a6f077a38acdf5f28e2c3deb3f3aaca41111ff6ae21f6f7c92e301180d44a1b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d113g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d113g0v0Filler.json
new file mode 100644
index 000000000..0fcb03747
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d113g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d113g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60716064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xef283851367e30cc78d8bb2b518299193c9a38a1d222d13b7c5418f99bf194eb",
+                        "s" : "0x8c7af3604a491b62df0ec2fcc67fc214ed137e7979c0f66273b41fe9ac43a6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1140g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1140g0v0Filler.json
new file mode 100644
index 000000000..adf84096c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1140g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1140g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104746064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x25bc3fc60373e1b1d0352d949b8689f87c34bdb15c24dc582624c53b18bb2f2e",
+                        "s" : "0x4b0795885bf1a798085978ddc14a1a72581cbf776f5581b16b906c3ee0d304e0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1141g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1141g0v0Filler.json
new file mode 100644
index 000000000..ce6b2b499
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1141g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1141g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104756064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7287d86cbd72ee8c5466a0e9b0e280c998bf2485df5358660ed1ca218def09eb",
+                        "s" : "0x783db366ee983be0f8f1e28a531e73a50bcafc4a7cb54f9368a2c20db8a2cb37",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1142g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1142g0v0Filler.json
new file mode 100644
index 000000000..eb32e82b8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1142g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1142g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104766064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4fa809d852e1ea979648467f327cfc4c49b75b226b6a6ac25939c25af3b9d0d2",
+                        "s" : "0x137b9ec20cd8feb6561cbe3f754acac89bce31e48ff41d2b9c041869c8436cba",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1143g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1143g0v0Filler.json
new file mode 100644
index 000000000..69b3a5d2d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1143g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1143g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104776064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x18efd73b7a4dde6cd3414fbadc8b392385be2ab0bb70ef967b84aa4f341389fc",
+                        "s" : "0x544802b5962b818ee3314180b7d5715f8083d504e36d0786878a34fe69728743",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1144g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1144g0v0Filler.json
new file mode 100644
index 000000000..8fc3fc4e6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1144g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1144g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104786064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdad6f9631d4ae9d7a7d741998004b631a1da36b1f26d5f17d10e8481f8e4a858",
+                        "s" : "0x5ba4950099dc2840c4da0c14dfb40e2143fb3998b27da593fdab9e5fd5f2c34f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1145g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1145g0v0Filler.json
new file mode 100644
index 000000000..83bbdef9f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1145g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1145g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104796064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb047aaa2d47832e89b8f54511e81b5adb4648673c3ce9e97d1d6de3775596ba7",
+                        "s" : "0x649dce809ddd77f097441e078951e47d733b365139b7281c899ff108e0a4d72d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1146g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1146g0v0Filler.json
new file mode 100644
index 000000000..1c49a7ce9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1146g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1146g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61047a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0469f22794f179af8a95cd368ae9bd7fadab4550f29902a9c8a6228d86576738",
+                        "s" : "0x7a057cd6e11885a54691c5dcc49a12d908ceaef24c0449abdcb380f85d3b34f5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1147g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1147g0v0Filler.json
new file mode 100644
index 000000000..6a62ccf53
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1147g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1147g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61047b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x59c3fad4844803bc4419e44ff7ab503bcf74961a5dafba4e5bfdcaa05b1d6c7f",
+                        "s" : "0x23c636bc00f366952407cd14931db822c6b8b36fe2a400e8d192c21c29076cb7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1148g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1148g0v0Filler.json
new file mode 100644
index 000000000..7fb7921b7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1148g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1148g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61047c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1e11f26f542d34b636a35951b9538faf2628c4011e15d4d7ef63d60eeca53c48",
+                        "s" : "0x1dfe632798bcc14a00f786ec55b1d586cf7e772b1c4bf4655a60546889fc96b8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1149g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1149g0v0Filler.json
new file mode 100644
index 000000000..f1f285626
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1149g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1149g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61047d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbeeff954bdc52be36c345b3c3377845e7ac540adbf607bd6c85118cd160f62ba",
+                        "s" : "0x2e01d9bb9b9f60f0c7d4b2867ba7efcc967d4df346ed25ace13663f434f9ef88",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d114g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d114g0v0Filler.json
new file mode 100644
index 000000000..5a86a29c9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d114g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d114g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60726064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa55609d67a94e1ecfa7dac74b4ec2d3dba936c79940708124c46d40d5be091f3",
+                        "s" : "0x1dc7ed58c16be661f34caf6fac88f6490f0e6ed6e2674efa3d9bbd8885c43e41",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1150g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1150g0v0Filler.json
new file mode 100644
index 000000000..59c28ea59
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1150g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1150g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61047e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc491a2533b7c9e0bc879ced2faff9e9f185c81b0ca30d1188b198732dcb22249",
+                        "s" : "0x65ad989e53b13a1048cc6931827cf924e4765599bebe3c8885f8aa842b43e1bc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1151g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1151g0v0Filler.json
new file mode 100644
index 000000000..5532c06c8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1151g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1151g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61047f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x439062e8fdf6d329edafd50df68d47d1fc328ceda5dc943dd7b2cca79e2a4720",
+                        "s" : "0x4efe7a3502af908e3e6d389e3d795d8f5f54f252712e611843e06eefa85261e3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1152g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1152g0v0Filler.json
new file mode 100644
index 000000000..be882090e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1152g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1152g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104806064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf5b5a6a475504a12285dfef5e2db207fb181e1f3081afc7b2e1ade248a5c1f56",
+                        "s" : "0x1e69a1d401ae3d984f46688f8dfcde9bcc186cf30ed3f5aa164c0dfcfb8cc95f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1153g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1153g0v0Filler.json
new file mode 100644
index 000000000..a21c43cf3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1153g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1153g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610481606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x755418c115d3fd1db0776f9d0d4b2fa2328c43fe2e0a58036297c51201ae4ea2",
+                        "s" : "0x267324e8e84d8538fe4da8fa6ef36f94e855a7f3ba9bf096b10cdd9dca53dcc8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1154g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1154g0v0Filler.json
new file mode 100644
index 000000000..cd70b85a4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1154g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1154g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610482606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4a1179b18dd9e749b7e46340f7e63732c15bf3f28ea94574ddc3b5eacd89b889",
+                        "s" : "0x77f50292ec71cdcb5df5d816225c80ecc889064f2467ad12e4730fcf9d032176",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1155g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1155g0v0Filler.json
new file mode 100644
index 000000000..c12ad8724
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1155g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1155g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610483606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa45e024b89802c41282ffbde65fb572d526e226efa70b446576e48ba4c74e304",
+                        "s" : "0x6f6e57b81292ab3efb635818a25cfa4c813cd6ddf1b14300d35440abe4495c49",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1156g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1156g0v0Filler.json
new file mode 100644
index 000000000..dc2595d2a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1156g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1156g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610484606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x95a46ca0e1a726061d4e19b6c7d052fdcb98278ce8afefd3cba2464827a73a1d",
+                        "s" : "0x08214c27f43b956c726111c6a720bf39f615aa249fa7d94967e392bfb7efdea6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1157g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1157g0v0Filler.json
new file mode 100644
index 000000000..552cee1a0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1157g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1157g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610485606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa08c5099efcbe1df1336a1c273af64740524953155a0299dc8cb495f11a4123f",
+                        "s" : "0x0345f2632a5fab631c4ceb3fa3d3778de76a14e071c75f1f518e01121d3e7d94",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1158g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1158g0v0Filler.json
new file mode 100644
index 000000000..17c795d78
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1158g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1158g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610486606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x77d1db20b2759547d2cf121c52d0067b6baced97a87094f005ed233b9174ad9c",
+                        "s" : "0x72b86f62021746f657a53e058afe2f64a5aaa75f1bcf8db1033cd20d48404428",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1159g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1159g0v0Filler.json
new file mode 100644
index 000000000..22f339a9c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1159g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1159g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610487606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x567de8a9809036252feb3d1f43ed4befe38c2c690d0a1f3dce2e5ccb2e9ccd40",
+                        "s" : "0x42f1485f5cf8a95544944a981caab3e6b5b2caf6736a61782fd552543ed9dfac",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d115g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d115g0v0Filler.json
new file mode 100644
index 000000000..b9b1ff8cb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d115g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d115g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60736064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc2b9e3d44e932d18d465251e2d16dc2c8b5514db1026721638c11a9395d0b5cc",
+                        "s" : "0x3be06467f6c78a0252612e285d3388aea40291634943d827876283c6630b97b3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1160g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1160g0v0Filler.json
new file mode 100644
index 000000000..fc69c2f82
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1160g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1160g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610488606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf3c1eb3332193e2e502c486f690405382aa656af5311038b86b55667977b23f8",
+                        "s" : "0x4def559500cac591fa71e7ce512f1bb78974917d14b368bbfb82a65edc2c2937",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1161g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1161g0v0Filler.json
new file mode 100644
index 000000000..ca2b289e4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1161g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1161g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610489606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbbd2f9355a044f261d49b80548831cc4ba91de744fd312a825ecf68b217a9f01",
+                        "s" : "0x5272a4eca5284347c0a00e5201acb77622ee0c4545d0347145af538f161f0a8f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1162g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1162g0v0Filler.json
new file mode 100644
index 000000000..c21df1b8a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1162g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1162g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61048a606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc8411d1f4668d3293ffa3610bdd4b64fee52149fdf83e88d339ffd59bf337a9c",
+                        "s" : "0x43b7b9ce7425aea28ed98cd5fd547fac2ce4d8690211273f375c15d47962f17f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1163g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1163g0v0Filler.json
new file mode 100644
index 000000000..6ad1e76cb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1163g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1163g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61048b606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdab2fefde202f4869c6d19870d960d2b54dbcc277b2ac2fdef914a5ee4c6146e",
+                        "s" : "0x0e18c8164907bf6c0a108e6d7bb8452542fc29c68a66adbcde8cdff3c7e302b5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1164g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1164g0v0Filler.json
new file mode 100644
index 000000000..e3a92e65e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1164g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1164g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61048c606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x500c9ee998baa0d8f328de04cbd9deb7111154e7b036d70690eaa2ab08ad6d59",
+                        "s" : "0x110a85a8a26533ae1ba9ca1c882db9ec21a4066e2f1493ba20540db43a64d552",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1165g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1165g0v0Filler.json
new file mode 100644
index 000000000..2c0a59f60
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1165g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1165g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61048d606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd444cc7876dbaf18cca7d9665663b64957950b5581020a37448ff350cf548512",
+                        "s" : "0x41f53a43036dff73cb3fab8e121e2e0185876cae3dabbd0529646231510f7f9b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1166g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1166g0v0Filler.json
new file mode 100644
index 000000000..a02bc949f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1166g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1166g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61048e606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1baac4aad91ee76e820ed790cdcc871015cf18efb30d5a65da9c800df1dd4038",
+                        "s" : "0x02b00f7fa42362f473aef9a7245423c7c60725075800fb4f684efb62a674a608",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1167g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1167g0v0Filler.json
new file mode 100644
index 000000000..9f918fb12
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1167g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1167g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61048f606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3e6479d74bc14cdd7ec0dfe14b2d143821b3c702552db0fc108eccecd6e657df",
+                        "s" : "0x3bf5fb8ac644ee0239cfc6b478f6ecc3a9af3c5c06761ed83b861c193c75aa52",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1168g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1168g0v0Filler.json
new file mode 100644
index 000000000..ac1bea8d9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1168g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1168g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610490606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2106f50feb751e7fbdc4be5e639b52e49ff5f319d29376075fea77faaee67004",
+                        "s" : "0x51c2d513f0dbf542d7b407f9eb561dc6be9b1678e0c5d28c4b6106d6d89652df",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1169g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1169g0v0Filler.json
new file mode 100644
index 000000000..50d6ecde3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1169g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1169g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610491606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb77067b6373821a71bbc670aee59e10f8ebf205f07ce364f10563b806e8fa398",
+                        "s" : "0x14a9fa677777af0e14e33ca066029feabe25f25efe5f84860ab73232cc81742d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d116g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d116g0v0Filler.json
new file mode 100644
index 000000000..6ffa51acd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d116g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d116g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60746064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x84000edd89cc72ec34c1379392da7f6d096338b17293821be985659856683cd1",
+                        "s" : "0x03a1fc664cb8c1bd43d8870347f1ff990aca6e2286dad5af9d09f58b05abb1fb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1170g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1170g0v0Filler.json
new file mode 100644
index 000000000..8b3736f1a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1170g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1170g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610492606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3b36efe9986b1fa8bf55d5a6b65f56c58b3c83797c333060b1736b8b6570df9c",
+                        "s" : "0x783c7f490633492a3b66efe4410bc33768ff758aba3a3805cc74bb05b4d77388",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1171g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1171g0v0Filler.json
new file mode 100644
index 000000000..efdfd2717
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1171g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1171g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610493606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x585b7499fa3917312e327db6e2960fb3ce57548aa47597bfa2e16cb63b343c",
+                        "s" : "0x24986f487b1f16fbc5eac976f9bea83f1354fe63bb2816d3b2152362c453cdfb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1172g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1172g0v0Filler.json
new file mode 100644
index 000000000..6a75b95e0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1172g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1172g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610494606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf74e3b2c1712aa4e2807557c970593f8a30f49aecfd07f8cd256439ea23be2d8",
+                        "s" : "0x68288cac0796164fd55c9ab0581ca79f2af372df43c00550cc6f2edf835a1514",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1173g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1173g0v0Filler.json
new file mode 100644
index 000000000..d3017c5e0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1173g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1173g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610495606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x676de0a6dd551a85a7a8cce37ef4da5753fb7825dc3b84bd3b580e5778c041e9",
+                        "s" : "0x57607cd508ec7da061726b2ee6c888a5fee7b2e4532c42e909ffb5a88443a986",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1174g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1174g0v0Filler.json
new file mode 100644
index 000000000..37d8f5c8f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1174g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1174g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610496606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x22ca47c0ef2296b0605d93f47556550a91b3ab29d6ffa7b90253e5f1f0a8056e",
+                        "s" : "0x4a0104f88f31174cec3b6702bea554d85323b248ec066a5109ffbe454c8504a1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1175g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1175g0v0Filler.json
new file mode 100644
index 000000000..81c4a7547
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1175g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1175g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610497606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa5bc7099ab3b52eb8834461efa3ba51283ef0634c2fbddd682f041347ac82d0d",
+                        "s" : "0x5695a92026deea930fb876a383877ce04a4b3a7c0a7dd30a3fac3311072163b6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1176g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1176g0v0Filler.json
new file mode 100644
index 000000000..fc361baa6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1176g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1176g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610498606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaa05184ec53f418205c1f63b949647b620f275deda4566a722cd7683cfdef0b4",
+                        "s" : "0x03ea3afbaff712f4f874b9e074a2ca6fe886a5c4a04125c3460480e44ac42655",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1177g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1177g0v0Filler.json
new file mode 100644
index 000000000..eea489bf0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1177g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1177g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610499606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xca3addce0cb55c73731baf5845916d0b2c57d4f07800ee457214a0048a088aa7",
+                        "s" : "0x25d281fdd2525438b28fe7e51fcdebb8bdf8f3dfacc41e3f3dafa431dfebd23d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1178g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1178g0v0Filler.json
new file mode 100644
index 000000000..d35e5821f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1178g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1178g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61049a606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0fb9ff21fb728b1a0018a8110777d213f75805821c62a078e182cbc07cbd19c3",
+                        "s" : "0x7040ce527929cf60adfc12780ea07ad3dd90cf0ab3251eeee43f802ce33d4ee5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1179g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1179g0v0Filler.json
new file mode 100644
index 000000000..36e810c43
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1179g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1179g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61049b606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x315531ee16af9b7e3742a27aadf2463ceee589d270b134b883f5e8fdc49cc881",
+                        "s" : "0x7aebb297be6e9d7b6b9798c4d55b753ea0cb93ca5dad934bf603bc874d098257",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d117g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d117g0v0Filler.json
new file mode 100644
index 000000000..b3760307a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d117g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d117g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60756064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5c2d442a1677e8ca0dd1f05125b450c892f7ece6605789785193a6132c9e08b9",
+                        "s" : "0x503e08351031dd7bab2a820ed915aacff516b27f956e334ff9d043c3a8b6df09",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1180g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1180g0v0Filler.json
new file mode 100644
index 000000000..99e550cd9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1180g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1180g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61049c606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4cdf8690c79361034e5c607571b53ceff3eb5fa30d3baf3383378ab223d18ed7",
+                        "s" : "0x298e3d9175ec082dba70ddfa39d09cb78cd23890a04a7c35b7f4334c64f225a6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1181g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1181g0v0Filler.json
new file mode 100644
index 000000000..9a118906a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1181g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1181g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61049d606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe45397caf5e2de7a66c33899ed9667c3e5c1d27bbef359c063e5db7511c6dfa0",
+                        "s" : "0x4455d41431a383bb27e089145d98954eeec8302dcedf09eb9f8c169b383f5746",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1182g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1182g0v0Filler.json
new file mode 100644
index 000000000..9d7b60888
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1182g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1182g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61049e606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x411f7b150a002c61dcd40532ce39d821a53318211c39301f6fb8340c841a7acb",
+                        "s" : "0x0668d1d6389262b8e4c2b967e97e99ca6a45c23f6b5068c0d361b726468e8376",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1183g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1183g0v0Filler.json
new file mode 100644
index 000000000..07f6b84b0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1183g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1183g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61049f606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1c87a9ca54a2d45a79e7f8f29de3377c0e7a72e9e1e0714ae6b3aff9e96fc548",
+                        "s" : "0x60751345ebab7d595287c9ee958545dbc1a31406ee4e2d45ced4a888438eb3ac",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1184g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1184g0v0Filler.json
new file mode 100644
index 000000000..cbd2f4913
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1184g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1184g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104a0606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xac7732664d5867f56ed4978ec892eaab1b6c4face094459c90e8210a407d6889",
+                        "s" : "0x1c530f1161bfcec74e2265da7e5696ba769a713c7d0ef517f47d1150a222266e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1185g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1185g0v0Filler.json
new file mode 100644
index 000000000..93da0435c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1185g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1185g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104a1606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x70191b765f344fa271f9e546265b5b78d08b4b39e806238fa7fd1005f614c2d3",
+                        "s" : "0x53015e07798242d2c8fdd2c3e8abb5e7b23b6e9df12246d7a3e353d7bf78953c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1186g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1186g0v0Filler.json
new file mode 100644
index 000000000..129e31bc1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1186g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1186g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104a2606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3e1385d299eb912cbe9fc5047dec2aa762edd62981ae66cfd11b6505ad949188",
+                        "s" : "0x1375d037e444b42e47f3dde8681e76370b3d677a5c665fd39657d3bec863ee62",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1187g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1187g0v0Filler.json
new file mode 100644
index 000000000..277972be4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1187g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1187g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104a3606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdac3d2f5bcf93918d6ff847c2e2ddf95baa76f4c5065656281915ccc2365b432",
+                        "s" : "0x51e9d2c77003f33e71fd3a39a6c9ca4a2fcfe4b97fe875e5f52bb1829fdc7ff0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1188g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1188g0v0Filler.json
new file mode 100644
index 000000000..c98d41a45
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1188g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1188g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104a4606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x61271d809b1ff0101618626d7e49df3fb377c0a3ded4593512dc2ada7f6e92e7",
+                        "s" : "0x1b0de71724372803069961825d00d1ceb0d6a82159c251af1ef1da3cdd4467be",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1189g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1189g0v0Filler.json
new file mode 100644
index 000000000..35bb76603
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1189g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1189g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104a5606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd4a2af2945f3ed0452e73e3c8c1818284b920ba42930da442662b01e33f795b3",
+                        "s" : "0x11b4889fb42d36c829c8e00fe29466d4205a6ba1491fe6cfd910b19e0af376d1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d118g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d118g0v0Filler.json
new file mode 100644
index 000000000..38c1a0bed
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d118g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d118g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60766064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6e9e443f999a15e6ed79f6920db925e7c81b9713dfb982661407c4ca5de937a9",
+                        "s" : "0x275d8e6d9b728a96f987a95cfb45ec931c9da4de5f090f4d23a9c36b172fb820",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1190g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1190g0v0Filler.json
new file mode 100644
index 000000000..1540ff5de
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1190g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1190g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104a6606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcebd0959bb52e07b0f2dbca2aee62fdb47ebbb75bb91278af3227220d6e273f7",
+                        "s" : "0x34ffee3deb9f4f4bf27e4a197c73ee19a774a4a9d17aa016e8a380b366769a8c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1191g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1191g0v0Filler.json
new file mode 100644
index 000000000..21a10aae6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1191g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1191g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104a7606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf925544d3a2c4896d02005a0303233a2013e8314b2fa784e1e4096eb072578de",
+                        "s" : "0x6ee7c9567c02783a5789a71bd5ab49e20bf0b8b74dafb9c5681737bc581cc0d6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1192g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1192g0v0Filler.json
new file mode 100644
index 000000000..280663e79
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1192g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1192g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104a8606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x37268b5daf2cd7242ba162f3015bfdbf29681bd84b412879faea08fe1a4351ee",
+                        "s" : "0x35b8a71502c0b5a4a9d0e442d492f1148e8fad430ee82e2960c9cb271cb88ca8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1193g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1193g0v0Filler.json
new file mode 100644
index 000000000..4fcd43fd0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1193g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1193g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104a9606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb47c6dc144fe669b2f66d049dbcb13889f652ed8b7202470da7fca351993f10b",
+                        "s" : "0x5b27564fabbf8d45db11388a71d65662d9ef232ee12f0f6c6cc6ac19b2048076",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1194g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1194g0v0Filler.json
new file mode 100644
index 000000000..bfd051565
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1194g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1194g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104aa606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x654b31e5af78b6fcd1176476eb8fd9d469d521400c4104c83c953ade2f42433b",
+                        "s" : "0x5c44c27f860b5c8038354db38333b172a4707ef40135f40239467d68c6c38b04",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1195g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1195g0v0Filler.json
new file mode 100644
index 000000000..db2eb71e6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1195g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1195g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ab606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x09a0377ad35e0273ec33cad7b21eab6fdd0d576f4310327b111e8addfecf17c3",
+                        "s" : "0x5085ed828ff8ddcb9973e4023ba5f6a260324b526fdcb09a84f03681d7fdb48c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1196g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1196g0v0Filler.json
new file mode 100644
index 000000000..0748575a8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1196g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1196g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ac606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x77d800bd86f249588376529abaa200543a4837f3003bfe9b58516c2b32bc9725",
+                        "s" : "0x77fe0317892369cb197be3b0d597e05e9b0412bff5149713e08fa79e0af98fb4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1197g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1197g0v0Filler.json
new file mode 100644
index 000000000..1c3c6ddcd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1197g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1197g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ad606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa1025a1a8f5b4bd4dc1fbfd892e8468b02e41d043ee223613b0348c579134d63",
+                        "s" : "0x1e79b7ffeda5709c3de318764df2c4009e6be403166d1554a197add6b7a5d871",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1198g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1198g0v0Filler.json
new file mode 100644
index 000000000..fb4c2d5cf
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1198g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1198g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ae606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xad93fcbb9e4b43c0557b7cd815eb5f8e4db4a5af30714d3520569b2e6c75bc37",
+                        "s" : "0x69910a88ac9e2a71865bcf2f17f642a615e1929460b35f66dd58c37eca4472a0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1199g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1199g0v0Filler.json
new file mode 100644
index 000000000..846db4129
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1199g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1199g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104af606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf03490b6b754e257fb1aac7b1e150bb6ea3f82bac7ce1005e0d0094106376773",
+                        "s" : "0x60c7025ab312b2b5eae537f8c16fc7b64c392909c1b81a6014abd248689d50d6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d119g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d119g0v0Filler.json
new file mode 100644
index 000000000..a0cac31ee
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d119g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d119g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60776064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8f890219352f935effa261c38f471fd21265f36bf317a6c093563499226ecf58",
+                        "s" : "0x504550ab315967146025592fc3eb5dab6548c9d7095fa6c09771e66a4a7288b8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d11g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d11g0v0Filler.json
new file mode 100644
index 000000000..cce093a5e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d11g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d11g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x600b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x70f7501d99c64315fffa01a4c0b520eb2877832cba81bac2b6799f5fdfb9ab9e",
+                        "s" : "0x18ee87407b8ca3c7bd6847fc07f0c70c61c8ca1576293064e7dde5794a81fbd0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1200g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1200g0v0Filler.json
new file mode 100644
index 000000000..8dd4d1db0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1200g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1200g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104b0606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xadb7b06776f5f090a74504f136b500b2969993b217ae9bb6dcca81e41e941cd9",
+                        "s" : "0x22ee954a6eeb468d4d75484908252b3557283b76442574f2ed29068f533c88ec",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1201g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1201g0v0Filler.json
new file mode 100644
index 000000000..8705bfe9b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1201g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1201g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104b1606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe58bee4c4b814a14405288a98420c57faf3e7ba5180be53608b37c70220d68cb",
+                        "s" : "0x3f00e42f9b30a87f793d4ee1242a9c3c55eeafbc21a80d5bace27fee8cf365",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1202g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1202g0v0Filler.json
new file mode 100644
index 000000000..dc3f78d8b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1202g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1202g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104b2606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4a11bb4e2183b798e84443ae94dccd9ccb3cf85e6bd2727627b5f027edd7f0c2",
+                        "s" : "0x439e287f05645e152ad597714c182a85da96f759fa607e2ab2b99adbc388688f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1203g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1203g0v0Filler.json
new file mode 100644
index 000000000..09321b4ec
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1203g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1203g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104b3606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd9d2722a5e6502efcf9f91be8b5fdd0a0596aae2fae9c2496c635ee1ac63c3b8",
+                        "s" : "0x6223820ea004d05755948e3638359478f417d07776a57ff7bafe50895d5b7322",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1204g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1204g0v0Filler.json
new file mode 100644
index 000000000..33ed7e7f4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1204g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1204g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104b4606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x954a41423ae0fa067514469a10b60b212ef0fa443a2840a44e68c08777ae4dc5",
+                        "s" : "0x0c675ba74c2166b6230fc3c361a73dd01a415be1119ce09da3d7504fabe94a1d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1205g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1205g0v0Filler.json
new file mode 100644
index 000000000..f9bbac01a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1205g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1205g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104b5606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x38795f84f2af0623efe609dda1bc47e6b534cd5fce49aabe3a24d2513b38d274",
+                        "s" : "0x2e52d7cef5ffbdd33a4264a2523ab595338627cd20906bfc4693e3cf9c08caa2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1206g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1206g0v0Filler.json
new file mode 100644
index 000000000..2548fc639
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1206g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1206g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104b6606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x62d6ab1c0613d61459227e36bb105acc096dea73f5e6be9ce5480725e069df73",
+                        "s" : "0x225ec7c489d838be9cea625969ce1a9d09288d4a6665ccd2e0f5ccedaa17b554",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1207g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1207g0v0Filler.json
new file mode 100644
index 000000000..ff9757349
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1207g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1207g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104b7606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x22f4d256273f1e052407c664ea5627cbd88c5ed5325ae321f7d7248786aa8fe5",
+                        "s" : "0x01aceffc3c802aa04a5fe5118055e023f4963d50510f712fc52ccc0002faa0cc",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1208g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1208g0v0Filler.json
new file mode 100644
index 000000000..54527e183
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1208g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1208g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104b8606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6c6efd3fdd065b43c7e2c09b8849c8a33f589f31f2a5d53cbede7ffc43cf65e9",
+                        "s" : "0x3378352de4e016879a6a0fbfadd80c64557ea42804dd76c6539fb5e34bc24a33",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1209g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1209g0v0Filler.json
new file mode 100644
index 000000000..1347e543f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1209g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1209g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104b9606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6dae8297399459a854c51ebd5a4ec70216720b86ac659d4ba3b49629e31a9177",
+                        "s" : "0x6241520f1a0f2a962068e96cd5add20bf3fedeb3085afc4c89cc0279001d7d8b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d120g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d120g0v0Filler.json
new file mode 100644
index 000000000..d57c37f9b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d120g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d120g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60786064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9a81ac2117bab39ac4a6db0e6588ab85cab784279bc0ce35f3d0151955f19ecf",
+                        "s" : "0x2bdca48c910f19c4934ce7ee677c12471fec40e15551e4961ff44daa944c245e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1210g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1210g0v0Filler.json
new file mode 100644
index 000000000..9ee2d627f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1210g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1210g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ba606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd58f5cfe1286330f09e93ff051b225fc010f51ecbe3249f600c1798f8fe40395",
+                        "s" : "0x0a91ce67beeab52aa137578791c7755d0fec2c83fca8f743c3801433123eb50d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1211g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1211g0v0Filler.json
new file mode 100644
index 000000000..021de799c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1211g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1211g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104bb606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa691529f3f0969be6891c474bfc13b50b7538aa66ca49d3d698ce6578ea37765",
+                        "s" : "0x13b7f81f5fec7924076da99c6c1a9d9ea77aa55d6c7c3a9fcac1046e359b45ca",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1212g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1212g0v0Filler.json
new file mode 100644
index 000000000..fc57c0432
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1212g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1212g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104bc606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe44653b1ff8a5f5ac109a74f72891e192383270ae5f9eef8b6fbea79cc60a386",
+                        "s" : "0x2995861f2aaaf2c71a278c5d110af33e79d8de2df08a10361c0bab4388cae32f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1213g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1213g0v0Filler.json
new file mode 100644
index 000000000..62834163a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1213g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1213g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104bd606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc2cd4bcdc1648ecc696e0351b15e97659623798bf3f6d0e53b69f9091793ecab",
+                        "s" : "0x72cb8882901f3e959629d875c614f9b501f0d023acfb7e10a33a9e113fd756ca",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1214g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1214g0v0Filler.json
new file mode 100644
index 000000000..762d7ef64
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1214g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1214g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104be606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb6c8cebc90cf99db2bb03fa1db5005af75a2a356b3c199b361975b8706294264",
+                        "s" : "0x0be00e8ee76793a40bf326baf5348eef2323592bbc7a5f05a36f01b000775e71",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1215g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1215g0v0Filler.json
new file mode 100644
index 000000000..c18a5856a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1215g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1215g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104bf606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1ded41ef08641ba1e40902fc6b6aec098825e914305cedda502058720c675c3d",
+                        "s" : "0x3a0d5be45c2fdabc2b6948cd7148befacd38e77eea0d22aa99002719428edcd3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1216g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1216g0v0Filler.json
new file mode 100644
index 000000000..70c5ed696
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1216g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1216g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104c0606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x96dc400fdd059d9657f282beca3f92730d53f693fca825a53bf6af844c8327e9",
+                        "s" : "0x312faa2a5e6ca8d4450dc07b0e0f5d7ee11f7903f2eff9f10760a1d4379d2e37",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1217g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1217g0v0Filler.json
new file mode 100644
index 000000000..5180ba5a4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1217g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1217g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104c1606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7adcb46b84ad832bbe186c55d3f4e398951bd4d686a662ccba6d0fb1aeb3aa0f",
+                        "s" : "0x4fdccf273d384942ff462a380f2f3c3eb78c628e04b260ba3c70dc8da0dd3140",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1218g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1218g0v0Filler.json
new file mode 100644
index 000000000..e157fa916
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1218g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1218g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104c2606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf902f74f596dcfb635f4a2170fff2920476f188c19280c4ec6387ebd103e3cd5",
+                        "s" : "0x62ee058ff4e71937fda967aa072e56ff40361b9f91e934119725c3b7b745335c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1219g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1219g0v0Filler.json
new file mode 100644
index 000000000..5eb0d0a5e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1219g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1219g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104c3606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa43b867be17e33574878d505105979e92688a2dcbacd7dd6f70c78ba8c71cdaf",
+                        "s" : "0x11de5001265880d18b9b21e5c56b599881df98edd789cdab4f4907fc9a9c9dd0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d121g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d121g0v0Filler.json
new file mode 100644
index 000000000..cb0fe4fb7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d121g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d121g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60796064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7d293024cac82d3581e06cc2c6a0fd5298f9d84cbe593b12d582f322ae0e62a5",
+                        "s" : "0x0855a79e6c0e97d578289f272862af9a84661a3e325d7839d4028d582b130ac1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1220g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1220g0v0Filler.json
new file mode 100644
index 000000000..41b0c75e6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1220g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1220g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104c4606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x885e668d77a9ea0ee9915f1b1a4182bbdfb772b088bbe0cc5788be3a6536ddf2",
+                        "s" : "0x09dd13d558a3320bb094d6e215a464f4e4a4a081f86429f6b467cd23340de6ab",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1221g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1221g0v0Filler.json
new file mode 100644
index 000000000..c5ed0aace
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1221g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1221g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104c5606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x89e7c3c895e690378485241935e28ca43e3ea3c34292a08b0d41cb1524935776",
+                        "s" : "0x35ebc78235a307ced6cd4c9ecaa2fe17d79575ad4b4f9935d764807cb2884fa6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1222g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1222g0v0Filler.json
new file mode 100644
index 000000000..c95562bc2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1222g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1222g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104c6606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6efc8aaad01854942880ccf185f32bd2fed08ab1171178460a9916a1fb96fb69",
+                        "s" : "0x3098bce5d3c2dcc2245f03553defcd3a7b1fdec2cdd6867f17d5bbbe5279f954",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1223g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1223g0v0Filler.json
new file mode 100644
index 000000000..0ca90ca17
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1223g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1223g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104c7606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xea69e183b9254a5c845b5257c9b306ed268371328548680f634c14cee72f2472",
+                        "s" : "0x28064b881784b6620fce53b6c60f8e1775abb5a1791a7c977dc0e5cb667487e9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1224g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1224g0v0Filler.json
new file mode 100644
index 000000000..8c367d1cc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1224g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1224g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104c8606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1bcc6480252276c7e77a25e36e3f879c905cee38046d70d9d94697724c6b105f",
+                        "s" : "0x5dd3243e347d553756d52ef03c2e7f8e82d05b765c34dea0adfb95886963fd3a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1225g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1225g0v0Filler.json
new file mode 100644
index 000000000..e42641fa5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1225g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1225g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104c9606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x16234af171e44acd9c11a989b879a648fc3a4ff8d5e3e0a65300801f987244e0",
+                        "s" : "0x25d843188ea44bc101ddb9b61a23261600dc5e37de42536a10c72886b7c696aa",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1226g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1226g0v0Filler.json
new file mode 100644
index 000000000..fbef2731e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1226g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1226g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ca606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x56ac54927ae0d880e07e3ab4ceb3c66c2abe335b715d43fa11d9f576749deeff",
+                        "s" : "0x5211f24d82e45d8efd8106306024b84884da77ae2ccd1621f40f7c25aae16ad4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1227g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1227g0v0Filler.json
new file mode 100644
index 000000000..6126cfbbd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1227g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1227g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104cb606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x710defbfc6ea27316726921a600a290f95e69d3d17f99400839aed130cd8096a",
+                        "s" : "0x75cbb69b9771df775c5bef6be84095b30d34e3a8c3bb50271ed0d69aa2039341",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1228g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1228g0v0Filler.json
new file mode 100644
index 000000000..b3db78774
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1228g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1228g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104cc606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf36b7d4245c0a28d3a8d52c0d103d206154cb1ac33aa27eac4134dbe1f8d7695",
+                        "s" : "0x38a1fb00406304ed4a021d478a9583b85b6db200603c6c9e466cd331d92766f2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1229g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1229g0v0Filler.json
new file mode 100644
index 000000000..e4cae4e10
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1229g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1229g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104cd606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xebf8a7d8fe868429ae82f7673ddbe52007b0041ee9a1420239a2999b6f46e5d1",
+                        "s" : "0x480208de8df0cb1f21feda26758ac3f7cedda050cf2e8f542eff829ffa7784c6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d122g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d122g0v0Filler.json
new file mode 100644
index 000000000..3caecc169
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d122g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d122g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x607a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd3fe31c3d85afe1f076d3ddf4aae30b7e30264cb821f56e58bd90bcf07076965",
+                        "s" : "0x3c3fa3c13960cdeeb68dfe38bf9c57fced8f1ce484d65b3f36a486e9256a2102",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1230g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1230g0v0Filler.json
new file mode 100644
index 000000000..0458cc1d9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1230g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1230g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ce606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x162fe98f86b5aa9345f38b3e938f4651796205f3ddb85094d4043104bf147e23",
+                        "s" : "0x51942dbc4cbcde9101d22ca9a4c6e1a1f9ee80d2f494eb81a30a28dcdac5835b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1231g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1231g0v0Filler.json
new file mode 100644
index 000000000..6c0ee59bf
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1231g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1231g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104cf606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfab6454b7f8847f0bf9149f5222dd191ade6c5ee9fde827a4b753589971f97b4",
+                        "s" : "0x4341297848327920160f83113c0ba299072e6087012bc33497515399de4f5889",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1232g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1232g0v0Filler.json
new file mode 100644
index 000000000..b14b26394
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1232g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1232g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104d0606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0875623f969f6900ab506510577e28984a761e2926ae3cd9f3d8a985a5f1bda7",
+                        "s" : "0x5c1732ba8562e1a7dbd18c2163b4da22d36dadf5d0cb5bb67cfba5ae5ed5ccfe",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1233g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1233g0v0Filler.json
new file mode 100644
index 000000000..daa695574
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1233g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1233g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104d1606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc625bc14860f4f5422ecebf866fd75fed8481dc31ed20f3c087dd3f80b84928",
+                        "s" : "0x44c31025cc3defc5a00e9b8c199b07f4cb3617556c92a1dc7fb8f15afd62edec",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1234g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1234g0v0Filler.json
new file mode 100644
index 000000000..4c2b2ac93
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1234g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1234g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104d2606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x60a308dfb4a67ff28f93bec6dbe933e99ec9b7ec0ff5030123988a9f5109f097",
+                        "s" : "0x7867e67831e5b8b9c5ba0350eb18ccdcd586d1730b839143e9913a2948efaced",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1235g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1235g0v0Filler.json
new file mode 100644
index 000000000..53fbea97d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1235g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1235g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104d3606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6d3c46a94c351b725b3527082a332ff0b93016f11bb966fe8d098c7ee6d1cedf",
+                        "s" : "0x4dad8f34f6dea180203599ea8f8bb8f0d95dbef2ec36e6f73922144ba9758670",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1236g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1236g0v0Filler.json
new file mode 100644
index 000000000..74ce6c07d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1236g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1236g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104d4606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1fb989dab8088eee2f1b304f693a6b55fb176069ca0953b3fb93073563376c87",
+                        "s" : "0xe72568d209850209714a59299f1689198f3222cb8c6b34e94c6038207d16d0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1237g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1237g0v0Filler.json
new file mode 100644
index 000000000..d6232c0f5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1237g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1237g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104d5606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x912efbb3f5a638e863103a9cbb36322c50884236fddbdd86ea2c840ca63f042c",
+                        "s" : "0x5d317eea35170afa2b7b1417ff03a612592945e12d00267d1924e8c9ff1f6ecf",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1238g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1238g0v0Filler.json
new file mode 100644
index 000000000..d48861663
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1238g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1238g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104d6606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb476367a397182e299df0fd6e4c3cac983507a5042a6878a2fc8216313ffa52d",
+                        "s" : "0x746aeb34628d86da67a49ee82a26a92e99f4eaec16189d3cae58566f2c9daaa7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1239g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1239g0v0Filler.json
new file mode 100644
index 000000000..9c57bf6ce
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1239g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1239g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104d7606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3e5e2f682cfb40c0605947319103b46b9182aa81e5a59a6261121f059652a962",
+                        "s" : "0x796ad2184a83c98d7a84dbbd560e388899f130eed37f2a858a4ec2ada3f5617c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d123g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d123g0v0Filler.json
new file mode 100644
index 000000000..88df4a64a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d123g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d123g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x607b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7e06294abc6b66bfaa872ab3103cf145d1539b09451aecfcd5081a8c73992a06",
+                        "s" : "0x78accd2b8167f63dee9961d956e587d052616a76e2da2a97ff96bc61cb8d18c8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1240g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1240g0v0Filler.json
new file mode 100644
index 000000000..297ebeeb0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1240g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1240g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104d8606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x29e13067aa27f72e59550f13f01a7811c50e1e627fea57084e25547952cac07e",
+                        "s" : "0x5486c1da7aa718cd2d6156f7c1ad539b9d7f8f92ee231ec92def7596e295374d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1241g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1241g0v0Filler.json
new file mode 100644
index 000000000..01d9e9a07
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1241g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1241g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104d9606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdaa31a446ef617eef5daa9a8c51cdbc3c83b77efdcb8640267d3922a7e13c6fe",
+                        "s" : "0x2732c0825585b62a7ced7c65ce57fef2c3cd1050bf5c919ca458a6117394a2ad",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1242g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1242g0v0Filler.json
new file mode 100644
index 000000000..17490925b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1242g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1242g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104da606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x537a33e311ee0d2bb0829f94da022a0b81d7dca8f2e38947786011c1105ce210",
+                        "s" : "0x44e26453bc43b792d6d8ff302a08c03e94d8cadca9a0f26ce188d8b8971e6687",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1243g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1243g0v0Filler.json
new file mode 100644
index 000000000..2db948561
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1243g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1243g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104db606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc6efb9666d632f2721d4feafae95d536ffc386d04fa456d8bf88e0c82ad23361",
+                        "s" : "0x5c6c97f1e1a103398a3cd7f325e0137e16c8919d6b32462afef0282cdb13dc0c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1244g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1244g0v0Filler.json
new file mode 100644
index 000000000..9593c5a22
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1244g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1244g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104dc606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa801f18d144601e736f2fd12ed5c8de1b1e8ff03f8d67721c0227b64c7534acb",
+                        "s" : "0x6ca30b5494861b6b0956008b7b6e830d3531f136b67d17fc0dc353cee91b0286",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1245g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1245g0v0Filler.json
new file mode 100644
index 000000000..236ca8119
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1245g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1245g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104dd606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x782ae03051f3e9effc5b6ca30469b0b82207310c2ff62f810bcfac223baa0243",
+                        "s" : "0x618eafa44565c1bc4cd71a0a9ff359010866200e1e5b021ee9ddb30a94b2b717",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1246g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1246g0v0Filler.json
new file mode 100644
index 000000000..bbfa36bd4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1246g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1246g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104de606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa43f73a6618441d93b22653b143c18f1b61499a42c9261731d44d55db7880adb",
+                        "s" : "0x5f07d82bea9a0117c850a2e9d62ba84741c4ec39054b1198df7716a84b763947",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1247g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1247g0v0Filler.json
new file mode 100644
index 000000000..d796089b3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1247g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1247g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104df606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6f4b81ee47674aa916da2892f45024ea6945f7b3dfcee9fe33057dc686171763",
+                        "s" : "0x0c443076a722df2d5b34b4c15a5469ce9b4870ea322defaa9fa10b9bbe7d87e4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1248g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1248g0v0Filler.json
new file mode 100644
index 000000000..934272dbf
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1248g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1248g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104e0606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc5714935a4df674cf68a060ee5723bee8f19c803681e19a95685e66d825fee35",
+                        "s" : "0x16028d4bcb9f25b1f2964594ace9749f3ff7fbf0881f13ce9148df9db473ea4d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1249g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1249g0v0Filler.json
new file mode 100644
index 000000000..8b750d818
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1249g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1249g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104e1606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6823793eace48abe380083eeefd6560add43e644f7e78e87f862b6e4370d48b2",
+                        "s" : "0x272576db267f9a31c14a9ea158c5b74db9d8345c862e39286886fc343fdebe00",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d124g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d124g0v0Filler.json
new file mode 100644
index 000000000..88b700f79
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d124g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d124g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x607c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbdcb6beac9f067ef15d1c6f08a18ee505d487f05699af9feed4f16c6850043d3",
+                        "s" : "0x1ed2cff5d3759486351ddd78f572ff45d03a462a0bc1e18267057a2497042988",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1250g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1250g0v0Filler.json
new file mode 100644
index 000000000..3b84640e9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1250g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1250g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104e2606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x07fd463c97e673a2c74d53117e2201ce4bf4169b90d8c7fb99f2554226fafcad",
+                        "s" : "0x2e98c62b3baf3fe19be265c390132d811e26ef954e55f80a2f2360e7cc3be37a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1251g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1251g0v0Filler.json
new file mode 100644
index 000000000..5588bb480
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1251g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1251g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104e3606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9f9fab62a264d5ca43f247ff67d0b3593dc050f591fe5a70267939d74737e54a",
+                        "s" : "0x2d4be4f17db522fa2f7d0c539a5a3492caaff12b0d9ad0fb7ec53d88c8fd8b75",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1252g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1252g0v0Filler.json
new file mode 100644
index 000000000..af4ab7446
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1252g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1252g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104e4606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb3010d4eb4008cdb5b854c45cd45d30f37d9edc280f59a65458e9160d8ae84e8",
+                        "s" : "0x7eb824ba344412bf55507d2c804889a11804af35de4229e84d7a7444fd27decd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1253g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1253g0v0Filler.json
new file mode 100644
index 000000000..b61547a38
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1253g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1253g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104e5606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdbdc21f4f0aa2a8eaadc53e10dade2a3e73735983e0ceab2cb018ad9062de6de",
+                        "s" : "0x47ac3705a86117e833b59e996ae2679705eefd4616e0b8cc93eb281c6484636c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1254g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1254g0v0Filler.json
new file mode 100644
index 000000000..e6e7d57a0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1254g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1254g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104e6606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0b75e915ae2572446148390d3b534e78c824c75169b0b41f7c28375c3e2e0255",
+                        "s" : "0x54e29af4355736194b7f8a4f88868d612f09af4df691ee69539957ae6b2225b0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1255g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1255g0v0Filler.json
new file mode 100644
index 000000000..dbbfa3854
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1255g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1255g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104e7606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x86376048a7c5757be9b8f3b9a991d74eba8a220c21f3e59cf161dcc0a74424b2",
+                        "s" : "0x7de5c3efd3ad087c1bad972e8271bb6a64c505c5efd3a68471cbdb435e9383bc",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1256g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1256g0v0Filler.json
new file mode 100644
index 000000000..2d3b9c3f5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1256g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1256g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104e8606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x51de79b106ea5b87bc19d07cf0ecdcd60b6777abf89c538115e8724d87d97bb0",
+                        "s" : "0x590436938081820d7449d0da9aaf937194990fefc4305f27f2bd88cbc4a73263",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1257g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1257g0v0Filler.json
new file mode 100644
index 000000000..669da1adc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1257g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1257g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104e9606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc1f56bc3bbecabce01c3d53410e29d1d40b694de6be4267904e4df1f79aa3df9",
+                        "s" : "0x2169f49c04fcaac34c62c2744a122afa38ebc145744ea0a7bd7a74d4203735df",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1258g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1258g0v0Filler.json
new file mode 100644
index 000000000..a275124a7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1258g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1258g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ea606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb3b1471d3ec42d250f62dd94413e4a1eb7d84612716aeca5a92e500a478a9146",
+                        "s" : "0x6744ca212b2937edc6e53680d8e41ead9c1c0ba09668e230b19f8665a660abc9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1259g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1259g0v0Filler.json
new file mode 100644
index 000000000..4c5c9c367
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1259g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1259g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104eb606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcb436c7049789a33fadbe165bcd08a74bb4cc436ed1f60ea2b25c630c615367a",
+                        "s" : "0x5b8cfde31cf4f15b7d56189d4aa5efc12105a585e9bde6e37882a029184c8147",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d125g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d125g0v0Filler.json
new file mode 100644
index 000000000..32cae20bf
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d125g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d125g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x607d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x13434fdc355fe36b4b8a8c19e28a341516ba6527d534805a570ec5d5fd164462",
+                        "s" : "0x07b49f577b0aa72d5a8c16b7f3ba9b2b58461322b819853b49116730eba61885",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1260g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1260g0v0Filler.json
new file mode 100644
index 000000000..73e11258a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1260g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1260g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ec606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd8c6cb6a956f0138968702a2eaf5461a20f78028bf18922d0bb639ee2f417865",
+                        "s" : "0x1da7f4d8bc11d5138386038edf053b3217281673aa6816b246b5b1e6f212c8c8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1261g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1261g0v0Filler.json
new file mode 100644
index 000000000..82ec1091e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1261g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1261g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ed606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5779a0a148ce5c4b5964849d71940aba704ad74a3e78959dc2e7ef8bbbc112f3",
+                        "s" : "0x7e79a54066086bba7fbf853a124b38d8570a3ce6d66b2404851d28c9df623894",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1262g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1262g0v0Filler.json
new file mode 100644
index 000000000..ea49a24ee
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1262g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1262g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ee606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x77ef03fd4c112765f8a1c0180d5c1f3571beb6a566142376077fcc697243ec6a",
+                        "s" : "0x2e89202ac397a220bc8db96c56c966407d8751e5b6f8c3a7f321175be93701fe",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1263g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1263g0v0Filler.json
new file mode 100644
index 000000000..1e3600991
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1263g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1263g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ef606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7c84c0cfa88e68f31807a01daefb9e7193c3eb542e1510b3e12c9b7be512c186",
+                        "s" : "0x4ab18dfe3f9d8d6bef08eb8827d15a339d719ae3ddf4f84a66f33a191e836f17",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1264g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1264g0v0Filler.json
new file mode 100644
index 000000000..ebf283451
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1264g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1264g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104f0606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbee042a9c1b4fa4ea1497cf692260f1a19882453f3a4b6f0138f4124d53f4de6",
+                        "s" : "0x7af4bdfb05db6bf2c3fa74ada1bd2773f7cb70022c313263450cdeada9a7b49a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1265g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1265g0v0Filler.json
new file mode 100644
index 000000000..af9ff282b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1265g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1265g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104f1606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xceb45b64c6c219a82e5000805832f8894369e3d5c9754b7ac6cd3edaf090dbdf",
+                        "s" : "0x3521a566d31dfb6a63c7b775f33d2618422b3be8a4c05ef37cd060d550841464",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1266g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1266g0v0Filler.json
new file mode 100644
index 000000000..aa129face
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1266g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1266g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104f2606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x42e8281a7fa24d868ead7b24c517a1f41b62ae1dfa152ce3a4e11c0832dbbe0a",
+                        "s" : "0x2808214dd0cbee660be5ca6e43af41105cd2960032edfb794702570840e5ec53",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1267g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1267g0v0Filler.json
new file mode 100644
index 000000000..d39f92adb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1267g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1267g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104f3606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0a0b211578a524607dcb6936b8568b8fab07bf3ab4098e84c43d304807e31fa1",
+                        "s" : "0x37d6fb281b1a6e780670cd6e591125b910e329c4c8e3d08980df2ee7410f33ea",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1268g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1268g0v0Filler.json
new file mode 100644
index 000000000..5ddd71f82
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1268g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1268g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104f4606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xed926490b57a1f8bf8f890cc8754a0ac224d5c1e4f341230f793f9edd73c7384",
+                        "s" : "0x6cfce3635d3c57900c0b3a79eb5098dac7f92b95391a2ea10cde3115c3ac0774",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1269g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1269g0v0Filler.json
new file mode 100644
index 000000000..112339b82
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1269g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1269g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104f5606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa0a803f0035475a20d8d5bd187bf634f8e086c05582501cc4b7b05e831429229",
+                        "s" : "0x482ca5780a30d1d1a16f080647251250167cdf3bf8b824c3ae58a79249b66b30",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d126g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d126g0v0Filler.json
new file mode 100644
index 000000000..e2e8a1721
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d126g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d126g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x607e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe3ba676061a16d74889cd452ddba600f2dd973f352cb5f2b57a114c73ded08c6",
+                        "s" : "0x20d828b98fe7dfaa97556eb3f989377d76cef5c1c17effcdf3a97842ac84a607",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1270g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1270g0v0Filler.json
new file mode 100644
index 000000000..3558f6888
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1270g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1270g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104f6606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0fda2fea3507c34400dfd688a48d86d7601816b6924e5174e5f6e5d553bf2c9b",
+                        "s" : "0x2d944f439ae310133af0668ddcb8ba5b60aba46b60fa21eb61325a512c92aa59",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1271g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1271g0v0Filler.json
new file mode 100644
index 000000000..eb52dbbba
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1271g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1271g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104f7606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdf8c1d9a387c42342892a55ee1b1bd89a07a3546551fad07dd75c183af07a56f",
+                        "s" : "0x72022bfd3537928e70854e10d76b28674f23ab59055431f5eb0eab4c49c90d42",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1272g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1272g0v0Filler.json
new file mode 100644
index 000000000..c02736365
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1272g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1272g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104f8606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe27adc80e46c302881e3983324c1922c3b511b6640dd7aebe851272d2e2ddeea",
+                        "s" : "0x5d9d732d39e1a983311d6b498d35b6c002ed719de63f51a59c61e629d88d53ee",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1273g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1273g0v0Filler.json
new file mode 100644
index 000000000..91107b2a6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1273g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1273g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104f9606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d718d5354eeea3662a8f9e934ac2ed2fd75dec93cb1ec264d72b68a4c9e3a26",
+                        "s" : "0x7c36b570ab066a27e01fb378f48f6c541868aebc40c9b3029e1bef6c9cc936d8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1274g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1274g0v0Filler.json
new file mode 100644
index 000000000..2acd050c3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1274g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1274g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104fa606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x25ab0a37e96316735f5a4c2f1ddadbcb26be4ba77534ebcf68691c7157eed3b6",
+                        "s" : "0x34a7a132d267d00ca8109b8ee864a04b58adf634b7d13a241d2163889aa2343b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1275g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1275g0v0Filler.json
new file mode 100644
index 000000000..7315a713c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1275g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1275g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104fb606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8dd73bad15409b7caa882636a238a52a936dc8e0ee9dccdd731208c4c86ba866",
+                        "s" : "0x1d0e62708556b7ca79d3da6fe11544c5b94d13e3d6744708eb5327ab839c1e1c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1276g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1276g0v0Filler.json
new file mode 100644
index 000000000..c3b6f5667
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1276g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1276g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104fc606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf4de43c83c47c1e3838af89034cb714b36e17ddf7de0789b14ecd2c2ce015126",
+                        "s" : "0x05f3881e7750fac6e6bd490f757c7774a85f393d17ef6363afc3139951e48a43",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1277g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1277g0v0Filler.json
new file mode 100644
index 000000000..37ddbcb36
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1277g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1277g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104fd606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3d021a4f9103ded2c14c7ffa58ea347e13831d1468b3748146641a1727b6c35d",
+                        "s" : "0x14b6ecf21a051f61daf8d31efe3dffa97dc4ccf556c02f4fddfc99de9300e7bf",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1278g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1278g0v0Filler.json
new file mode 100644
index 000000000..bdd86d08b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1278g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1278g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104fe606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9d6bacbfd17cf4519914fe3f0e7f2b727a7ceca47ee7befdddd6ba0439fd0f10",
+                        "s" : "0x0e2e5f06127232529fa9f1e81581c9156d7b5baa53bb5e0faa625793c4c2d4fc",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1279g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1279g0v0Filler.json
new file mode 100644
index 000000000..91f711da9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1279g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1279g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ff606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd0b309ce30fe0d0a1bf0e709c6a09614e405c1296cbf37429b587d2a8f218006",
+                        "s" : "0x0b9c058e555debe396f874ae1378fd729322195ffa0e716df8f2528939a6997f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d127g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d127g0v0Filler.json
new file mode 100644
index 000000000..dc94d5907
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d127g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d127g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x607f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x16bd790ce14a97fd7b5de3dca2590117a7598b01c87ba056fb93f5422163ee5c",
+                        "s" : "0x76423ad13b15012686a81f8f0056fb7395b37a11a2620019f674dc94de98680a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1280g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1280g0v0Filler.json
new file mode 100644
index 000000000..e6fcbad2f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1280g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1280g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610500606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5f3a7f5da397bcbb4505266d1c45eb8637e4fddff536220e88785d935d23a390",
+                        "s" : "0x70083b60289719e79ac2501a7adbf79a82056a9ebb33ebc61bf49b30928c8999",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1281g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1281g0v0Filler.json
new file mode 100644
index 000000000..3bd874821
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1281g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1281g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610501606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x937310ecbc043b5b2cd9a8597fd70914554d61d7a68a6d976d2e6b3040bfe588",
+                        "s" : "0x08471b10d2b39c5885dbf7314589980cfd21fc295dca593a0659131415a1f397",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1282g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1282g0v0Filler.json
new file mode 100644
index 000000000..602d1a634
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1282g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1282g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610502606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc6dff9b3cd51b27c253713fc10db033cb394b57dadac505062cc35f082c04e47",
+                        "s" : "0x5ddda964a6b9d3dcf812b3407e1d9354d89bf1f88c98aafb2d2278a0a2756c0b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1283g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1283g0v0Filler.json
new file mode 100644
index 000000000..b4c07a107
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1283g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1283g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610503606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdb83353ec28a99c130e2538c8e6feb44378f45e35dc6b922d590779099f78a14",
+                        "s" : "0x3ce663bd59984f48af2fff5ce9465d13119dfbc83eced36c0e4bbfc306255f5f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1284g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1284g0v0Filler.json
new file mode 100644
index 000000000..7b5f5f72e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1284g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1284g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610504606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x95ae86ff672cc00ba4a802c65353d904b6ed9125d395b0efdfa32a11a5ba2054",
+                        "s" : "0x0243dd5c3b446e8c7431f91d6be438e72c1de35437ea2584dd407f0027658b4a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1285g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1285g0v0Filler.json
new file mode 100644
index 000000000..46ec43b80
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1285g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1285g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610505606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x05bdad9650ab9b833062c40ee1b8b6a8930f835e6f02285e32e9f083ce52eb9e",
+                        "s" : "0x3c8b18474cebd767544f8107d3b3e6252c2b79d54551af15299dd5131f49eefb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1286g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1286g0v0Filler.json
new file mode 100644
index 000000000..47be31651
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1286g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1286g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610506606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe4902c41e2ea625a6400d369f19f43be7491f8376b6d3a19840c7815df6f76ed",
+                        "s" : "0x3df98ea563931a4c4eec780a25da8d9056047746de2f9592f0aac7993c750587",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1287g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1287g0v0Filler.json
new file mode 100644
index 000000000..e4230670a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1287g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1287g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610507606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x61d9341cf1681102cb85fd0d8d6ff2bda0ca16ff337bffed53e70e0903ffc9cb",
+                        "s" : "0x633114e98695b3e98bc6897de5a1d1304aefab6cd2415fb6071ec9d2c3056555",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1288g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1288g0v0Filler.json
new file mode 100644
index 000000000..fc8f13558
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1288g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1288g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610508606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7e7b0422c43bcddb7ca5442fe79e931b9672768bd89f1c5fa8e82043fec7533c",
+                        "s" : "0x564b301e074fd6f875e4f02d9b5c916c5cc73ea89cf3ed86842249770106fb24",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1289g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1289g0v0Filler.json
new file mode 100644
index 000000000..a856e2a7e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1289g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1289g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610509606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xff68f6bc49cb8c884f66f18a7797e4fbb4035e51feba5ef87bc093b243e31b75",
+                        "s" : "0x1d2390a586e25f9409becfd589f65546cb24abf915eb56f6ea2f2d075f95e7c7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d128g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d128g0v0Filler.json
new file mode 100644
index 000000000..93d7535d5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d128g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d128g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60806064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x688abc929b1b4afb382e9d7f28106bfb235c70518cb46f53c42bf90b6d76b954",
+                        "s" : "0x3d6076853c44ff47ed3e5e07aa4989f1e420df3886f9b78a4fc349d411300d0b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1290g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1290g0v0Filler.json
new file mode 100644
index 000000000..59b224aa4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1290g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1290g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61050a606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9dbba6dc4ef09e5ca06d66200dff1350b60d7c5dd318889b6b5df733175d8cda",
+                        "s" : "0x55c6faa09885590f278c0023269475164746fb0453e8ef1fdbf0dc9a119dc932",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1291g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1291g0v0Filler.json
new file mode 100644
index 000000000..cacdf99df
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1291g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1291g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61050b606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe342be122dee01fbb81b6014e98c37f003a08f1e2c72c8e9daa8a601519f1335",
+                        "s" : "0x56b4331f3405707668e517ef5d35533f67a360510d9506dba43deee88245fa47",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1292g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1292g0v0Filler.json
new file mode 100644
index 000000000..2b31c851b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1292g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1292g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61050c606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa6090270382929141c47c4003888bbff09c08840f75f9ca83884c6e7a60f5604",
+                        "s" : "0x1ae8c80f2474c2b078fd8db4e8f754f89e8e154d9c3eff4e7c291ccdc036c4ed",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1293g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1293g0v0Filler.json
new file mode 100644
index 000000000..34a217486
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1293g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1293g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61050d606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x86199fd51dd8aa16f0fc86874b19239fd2b5a4f086bc856f3bf70d7ccd448ed9",
+                        "s" : "0x2474be56e65d18a2dd656a0f82769b618558ca983685e33070f18ed72b631734",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1294g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1294g0v0Filler.json
new file mode 100644
index 000000000..6d6daecc8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1294g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1294g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61050e606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x68dc508444136b6b13fa784fc0361a5dfbf008b90a9e431b745bbf261c863a10",
+                        "s" : "0x0810c35bcd96f4c2e2aec09f7c541b8e8c967117d8986dc451b06aece1186305",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1295g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1295g0v0Filler.json
new file mode 100644
index 000000000..39ba464d6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1295g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1295g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61050f606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0e4c36c26d59540a77ace1070a6b25ed2adfbc5becd53feda9c852102046b603",
+                        "s" : "0x1257a9567124b6dd694f6a22f063591476714bf3f1ed66a8f70abaf6add0ad98",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1296g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1296g0v0Filler.json
new file mode 100644
index 000000000..a5b415a65
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1296g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1296g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610510606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x249fcfbcfe2f8a9d073dc9999eee1bf7e8f2f4dd5c6c673e43cf36580262d964",
+                        "s" : "0x6c9773c890dedf907ad238bdbddaf7e469a8432b3dd8b328c486a91002aa6267",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1297g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1297g0v0Filler.json
new file mode 100644
index 000000000..497e2b37c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1297g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1297g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610511606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbe3c45cec382cb93c6dd4f58f3e0cbdaf57caed75b76ee342c76762897edf5a4",
+                        "s" : "0x2c95c3367847e053710485712c547a941b2079a5caab026ee0e861e16d3f3665",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1298g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1298g0v0Filler.json
new file mode 100644
index 000000000..5028eade3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1298g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1298g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610512606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x66a5b5ebb1335bac47f837b71b3bc537999a1ce976357617929fa61e63ddc379",
+                        "s" : "0x17ad9a5c58394b4d21375a1ccf4d0a0e63f1a41c433c0e72a26672f2e80e9c02",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1299g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1299g0v0Filler.json
new file mode 100644
index 000000000..7a37a82a9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1299g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1299g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610513606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb73c4370f27ba500cbd98bb54b16fd4ec39b02be18fbf5b10e0b97e0ad9f78b0",
+                        "s" : "0x0835deafc7eca56d0650e389ec1708679e406bba5bc7313293d7331acdebd4c5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d129g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d129g0v0Filler.json
new file mode 100644
index 000000000..f538e741a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d129g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d129g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60816064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3f04aa0de166910d6c627e46458af2818df606f354e06cc0081328d08cc0b60a",
+                        "s" : "0x35311dbc532926983a1348b866e3b79624bddeba4f690c613c363bab5f88d7c4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d12g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d12g0v0Filler.json
new file mode 100644
index 000000000..b1145fdbf
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d12g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d12g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x600c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8121689be03ed613dd4569c2d7dd4b6b93cd0abbf9cae2e3a3772f5f363b5797",
+                        "s" : "0x568ffb7148fe35b1f47775c1851684bba0def56dd8906eb1eaec3e5c1bb44e12",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1300g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1300g0v0Filler.json
new file mode 100644
index 000000000..b2a40d2b5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1300g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1300g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610514606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7a82920bfe7145bd5d7b7cd9867123eee9854881844bdd1b922ffe7b3029c996",
+                        "s" : "0x43c22a8d65c2a6b3e9bd9042adb047aecbde0075ef7f910de62c61d43b064b3e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1301g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1301g0v0Filler.json
new file mode 100644
index 000000000..bb4911247
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1301g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1301g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610515606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4a4ac986a26688cbc2a80d7e33aab5afe227ae9d94ac499097ad80c22fa86341",
+                        "s" : "0x3933b5230287f1b46ed9e60f01d22b22cbd3aa5e47ff7d9d1d0f07923d2510b7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1302g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1302g0v0Filler.json
new file mode 100644
index 000000000..acc91e85c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1302g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1302g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610516606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x66807288b771571746f68583f3109ef9ad962c22ca42b1fc44f352e00ce2b535",
+                        "s" : "0x45f0b7385b584ab256959a423eac1f5b9fa482adad2af898dfcab19bd426c0c4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1303g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1303g0v0Filler.json
new file mode 100644
index 000000000..4c6d30d2f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1303g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1303g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610517606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe815bfa9e4881817aa3cc7e5dfd44939b374829efc886f9cf4e71b1d59398176",
+                        "s" : "0x4bae5dcd6c12b3054b5de1a82e07f93d018bbabfa9029a41416c12a374507851",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1304g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1304g0v0Filler.json
new file mode 100644
index 000000000..37f5aaeac
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1304g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1304g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610518606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf0720131910f2a4639e5fb3b604f407104e0cff364cb8abe7c3acdc9d82f3dc5",
+                        "s" : "0x63fd8cc29321154ac5325ef6ebb2f963bcc1c09fc150fe9385cabf4c05762978",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1305g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1305g0v0Filler.json
new file mode 100644
index 000000000..3137065c1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1305g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1305g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610519606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2ee47bd35ee1a65bcdea5b7929b4abdb195d06965439c30ab0690b4719c4abca",
+                        "s" : "0x3944ac38a35b4fd1e2dfba52676179c84e443fb762887117137e42174b680489",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1306g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1306g0v0Filler.json
new file mode 100644
index 000000000..d5c2c4783
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1306g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1306g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61051a606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x22c170fe48d7e1dc6cac508029faa53b6dfd9edb433dd32ac7efd0a5a9e0603e",
+                        "s" : "0x1578d5ca972041f483a47c066a3ceefd6dd177271dd4475d3a433e58dbd7eded",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1307g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1307g0v0Filler.json
new file mode 100644
index 000000000..26bb8395b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1307g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1307g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61051b606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5b32d6ee5d95898515834d34fb971277d8a4539b6d3c0842178f275b40f57e0d",
+                        "s" : "0x21cdd377301495e6f1795ab3e8f7d8d94f357468edcf3ec558d01313d8b8cc53",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1308g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1308g0v0Filler.json
new file mode 100644
index 000000000..c840541a1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1308g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1308g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61051c606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdee067fc08c38426f4dc230e9961a058c8b5097653549433cbdfe923d86f13d3",
+                        "s" : "0x550e77b2be0bfce4796a11510ffb2aa39c372a04bfb2fe19566a87bd0dbe14bc",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1309g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1309g0v0Filler.json
new file mode 100644
index 000000000..8efda23f1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1309g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1309g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61051d606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1e6c0bc5397b8a876a394f99e4ff142087d7d44a081ca2f9db7c7fa170332a3a",
+                        "s" : "0x0ea437ce52235d781d002d1a94042f43d1efa336dea14edfa08276733e4633a7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d130g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d130g0v0Filler.json
new file mode 100644
index 000000000..1cde4edd1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d130g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d130g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60826064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x105d3e4a93e0bc9e85794ca5d3873b43d4fd923e48c0c6511ce75b36f951c89b",
+                        "s" : "0x15d2b55020b40cf6fed6fd42566f9c58f6a6521d0a8a0a7499950bac7349f3af",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1310g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1310g0v0Filler.json
new file mode 100644
index 000000000..101c51740
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1310g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1310g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61051e606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x879d395f3c68872b5621b6916af78c3fba860b03179cc0c728626be705f5e6ab",
+                        "s" : "0x4a77a1e7c46591b5a1c43fe3070c9b00da6c9a88ac260b5f8840479b8728234a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1311g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1311g0v0Filler.json
new file mode 100644
index 000000000..3e9983991
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1311g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1311g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61051f606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd97313299d7cf3db3e970c1bd0f5dca421d390e03a378e36e4d2b6e57f4f5bee",
+                        "s" : "0x267be02f91a45ee72c5eb1d2b9a9e2eb4abb25a25ab30bcd87d165e2b126be61",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1312g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1312g0v0Filler.json
new file mode 100644
index 000000000..67af84da8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1312g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1312g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610520606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x219bd099813a93ab0fb63f6ae9640cd58361f674cc0552c379edc7d52773e63e",
+                        "s" : "0x10d35bcbb7eb613f84f91c14cc5125204372700b59f2351c1d9bc213adea8829",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1313g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1313g0v0Filler.json
new file mode 100644
index 000000000..1a6633b35
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1313g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1313g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610521606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x73ab64b7aad18b30654472a4802a6d864ee266893441c6396dff4806d19201b4",
+                        "s" : "0x63ec883df30cdee018fa5a0ea1def29f22eedfa04a05a6114af6806660387576",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1314g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1314g0v0Filler.json
new file mode 100644
index 000000000..764efd2ea
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1314g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1314g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610522606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf5e8b67b6ebed8e75bfb7ab822352458c330af49c045fc3a2a1ee6f682198ba2",
+                        "s" : "0x590d42d9e5a0c3000e915ea1ef3887ca9ed62c9b01cb7b4c057c5c5a15b9cf40",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1315g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1315g0v0Filler.json
new file mode 100644
index 000000000..19e3e92ea
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1315g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1315g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610523606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x47c9de2b85f19e49a2e3a3f5f33366e27867daa329b6232aa834480174f1876f",
+                        "s" : "0x775a7947eb591925ae68f84994bd2217fbae6c965f8241638f493df3e4c7e78d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1316g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1316g0v0Filler.json
new file mode 100644
index 000000000..b20ab9a14
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1316g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1316g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610524606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb504fbe54e90f446ff994a9f6fec0b72ee9d11e82e31aff76f048f8b6262eacc",
+                        "s" : "0x4ec5cab1a1f9e625a1f8afaa0ab4345812ec62ae13e961c05fd02cf0db814b1d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1317g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1317g0v0Filler.json
new file mode 100644
index 000000000..177a98741
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1317g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1317g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610525606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf0656346588d1c37132985446373cb1e0a65e02ec45eb5ad80535f66ef794925",
+                        "s" : "0x325f9846dc26e67b164db39190c8e5b2fc12828541c0278d416755c40f758b4d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1318g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1318g0v0Filler.json
new file mode 100644
index 000000000..6d4249bb4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1318g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1318g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610526606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x725dedcc308b8a8c78c153452327ad1d3b768b5bcde921fcf391be28456b7c5f",
+                        "s" : "0x3ec0eed886b593ab706604103d0c04f8e3e6768aef8bfaaa9792da227e521a58",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1319g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1319g0v0Filler.json
new file mode 100644
index 000000000..d09650855
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1319g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1319g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610527606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3508c90eb16ea4e95f087a4b1abf8ac7ca17d9660eb2d2c6029dd8a8f1887008",
+                        "s" : "0x707a939330c301d9f71d0e1077ffd7f7ee652658e70cab97cbe3b1ef71a9c55d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d131g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d131g0v0Filler.json
new file mode 100644
index 000000000..2a2220216
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d131g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d131g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60836064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x95e05d4f3da9fb4c4118e7206bd5b2e68283beaae33581d068277391b709bb9c",
+                        "s" : "0x347fac88c5888b64070b25ecbc8b565a515e4dd480748f39851a825c46b12abb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1320g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1320g0v0Filler.json
new file mode 100644
index 000000000..d618627d7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1320g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1320g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610528606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5f61a56df1db7f64edd8459591f1db9dfcfa97237d4f3354901f7a0264bf9716",
+                        "s" : "0x0e4d9e929b14e3f2f9cd3c4332b5648de180890799aeb376559f9f61d1b7e069",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1321g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1321g0v0Filler.json
new file mode 100644
index 000000000..05f65bff4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1321g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1321g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610529606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8b3281fa6a91682a98b8e39ac2b2c8850462aba00e3e292a4714313946cf7790",
+                        "s" : "0x30fe16ac6341e35484bfa35300aa5183838404202d3b3391afeea3f4bb933e5b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1322g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1322g0v0Filler.json
new file mode 100644
index 000000000..4a7151355
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1322g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1322g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61052a606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0c62711a57ff18d65b8761099c05ecc323cb16a690644675095ffd3e80035372",
+                        "s" : "0x2d6d3f1f66c81cccedd9d89af98f1df9ef736aa25c060723ea1f350a04fb59ac",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1323g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1323g0v0Filler.json
new file mode 100644
index 000000000..800bdfcf2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1323g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1323g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61052b606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0aff33584f3ce2b9dc98e02714cfc84710bee48affcbc7d3d4083c4232e9e080",
+                        "s" : "0x28bc1d870c5bb1cb4570fb727462335fb2ce966b8ac183769c92333b951f0670",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1324g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1324g0v0Filler.json
new file mode 100644
index 000000000..5ce9fd2ba
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1324g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1324g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61052c606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x12231689888ddcaf05224eff2baa3f4652f3c35cdcac5e0bf70533f0e198db5a",
+                        "s" : "0x2436a02d14217ffa6fe7981c9fda6ee942f8dfa4a2d71388005656fa4791a56c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1325g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1325g0v0Filler.json
new file mode 100644
index 000000000..c896700ac
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1325g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1325g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61052d606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x27ff3f12dbc13642f7c69542797e5e3bfbeac593f59ecf18dc7c8fe96208c79e",
+                        "s" : "0x57efb9da21c36480fb8010e081ec56d709dedd8129954ca969af603038b1808e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1326g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1326g0v0Filler.json
new file mode 100644
index 000000000..9c29cc0e4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1326g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1326g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61052e606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5c45d9151d82b45da03fb018a316533f72822f9e684cfcc02138b398edf535a3",
+                        "s" : "0x50104ae96e33a925ff317d5e6fb47dc5cb63da45114d2cdb90139faf486422a1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1327g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1327g0v0Filler.json
new file mode 100644
index 000000000..0a4587cb3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1327g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1327g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61052f606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1a52ff5ec616b66d24d1c03621420ba0772fa3f29570c51713576dfc00e75258",
+                        "s" : "0x345b6489792dd1db9cce51aa9706b707abc0541c359407ac092166e0f584d7b6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1328g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1328g0v0Filler.json
new file mode 100644
index 000000000..d09337d28
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1328g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1328g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610530606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf4889e8293782d693d8d044191004f547147a4e943e9fdb5458d879f1f7b0e6d",
+                        "s" : "0x1c4363840e734c528fa435b29438ba32f844225a64a31690a11ee5ef3f57443a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1329g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1329g0v0Filler.json
new file mode 100644
index 000000000..6cefeefbe
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1329g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1329g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610531606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcb57e04fa76fbd92cd07ffca081e15af6442d2a7028f4865357e8dac67d91b55",
+                        "s" : "0x6c8fb538fe978f8c0b3a6b6dd49bf5c54b0ee6a20bb6f17185d4bafd3e220ece",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d132g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d132g0v0Filler.json
new file mode 100644
index 000000000..ab6fe696f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d132g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d132g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60846064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5392d81ad39afb2480233696d36dc28d1e7ad9b25d59bfa4aeb2edbe0e31eb91",
+                        "s" : "0x15421f96ba5f5a733776f6deefec4074ae472472917c182fb3664c4f5bbd6cb6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1330g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1330g0v0Filler.json
new file mode 100644
index 000000000..bb4016c66
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1330g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1330g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610532606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaad0f6979c737b9d103e3ee77d1fe4111bb68557fc56d408b8aaa82082dd2894",
+                        "s" : "0x05bba9baf18d208b2ec2a40ed6e5f55439e9859dac4b53b71cd27c0aaebe6977",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1331g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1331g0v0Filler.json
new file mode 100644
index 000000000..4456f3975
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1331g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1331g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610533606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2a1b80356b86fba0ba66827747fcbfcce3593f3cd3913684985719bb4fdfeefb",
+                        "s" : "0x20505838b523bbc25a7549249407c4698b76d5b0d9ad4af0402b477e99d51823",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1332g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1332g0v0Filler.json
new file mode 100644
index 000000000..3e923539e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1332g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1332g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610534606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5776fe7199a5d4c5f77c0731e84d7d96694b1edc1654e2787bedafca70b9b28a",
+                        "s" : "0x51bb6bb6a6814cb6849d6bde854bdc1bf6bf090329c484baefd3de7ed4515089",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1333g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1333g0v0Filler.json
new file mode 100644
index 000000000..8d9792037
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1333g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1333g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610535606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x99957b99adebc06a522cfa24232c1970cbe96c5d22e557130403562063151bb1",
+                        "s" : "0x68898ad322c189a890eec3772bb57f925c299a10c9579d8f033282241def9dd4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1334g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1334g0v0Filler.json
new file mode 100644
index 000000000..d41d44eb6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1334g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1334g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610536606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd3cc19ea373218c8fa13a386136d8cb14278275b97b797265b52536a1be8c0ad",
+                        "s" : "0x1710221b637fc9a6eeb30d0b482c9e04e814af9f47e281ad6c75b790b9058252",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1335g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1335g0v0Filler.json
new file mode 100644
index 000000000..35d3289ae
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1335g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1335g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610537606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4611ee8311aa10861e18b5ed3b5b95ab743d9a34625066401c19c09e0e0ce698",
+                        "s" : "0x66019c20bd74c111f44b973ad958b1e05a96fcf60de95b3e5e472fe51f2b4792",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1336g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1336g0v0Filler.json
new file mode 100644
index 000000000..667ba79ba
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1336g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1336g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610538606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6af94d121b5090b46c6f82d2f0ce1f3f654364ee85c3bc9be27e8096fd50447d",
+                        "s" : "0x52b33a5fc1bf3c5537e963e64ae3cfa0ee29b9b2583a41d0fc60ba874374f0af",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1337g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1337g0v0Filler.json
new file mode 100644
index 000000000..4058ff639
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1337g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1337g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610539606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xff3d205205ad7239eeb3a89a79803e30f07376bc4d71a8c6f826388e7c3bec87",
+                        "s" : "0x1e09751c8fc6663d65811b00eac947f8a354f3b2f135f4ecb7a83d2efb366595",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1338g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1338g0v0Filler.json
new file mode 100644
index 000000000..4171af64c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1338g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1338g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61053a606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x92c30952a76c259d703ab486cb55c02a8cdf136afb6671d222cc415767e9f0e4",
+                        "s" : "0x40cff309038a920b32dd20df54494d3bc352db834a0285a19064c676dcce7ad4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1339g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1339g0v0Filler.json
new file mode 100644
index 000000000..5f562269f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1339g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1339g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61053b606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbb786c5b57cdc9881ff1ad0c2b38b79bf6524f923768159dfb8d9905a32426db",
+                        "s" : "0x0c0e38af347ccebdf293d7679122cdd6d508049567190a71e1c531a538af7f27",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d133g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d133g0v0Filler.json
new file mode 100644
index 000000000..cd326d7f3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d133g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d133g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60856064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1fb7806fa4c1ca095f44b15e9cdb23154610877a2465354e7d3cd6c99b933601",
+                        "s" : "0x626083de40f583979cf0abc1aa92e61777b621f7ecd9125fc43ce4200ef91c58",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1340g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1340g0v0Filler.json
new file mode 100644
index 000000000..824049eb9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1340g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1340g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61053c606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5c88e7b716c10275202de70f74e341b817fb5f65e5e1e0c540fd0ea8aa53b4ff",
+                        "s" : "0x79967a9cee9a6231d9acaf1eadfc825c7388f4717faab4dad421317be2448a2f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1341g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1341g0v0Filler.json
new file mode 100644
index 000000000..f3099f1a7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1341g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1341g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61053d606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x34d060dabfa9ab2fdebd7efa1f1d8f52002689b5233a129f99af3191ceaf06f7",
+                        "s" : "0x7b75894798fcfa91226d6244c5239d592ff1d2c322d33f45bc1efa28104b7de2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1342g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1342g0v0Filler.json
new file mode 100644
index 000000000..67c12cc0f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1342g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1342g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61053e606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf2225e6ecff433996dfea905c1f333c04dff51fa85a3051dfab460b33c66cb47",
+                        "s" : "0x6fc1bc580b9461c4ef1c662128e32922dd867d033659bd90ca2912f1f56d7f51",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1343g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1343g0v0Filler.json
new file mode 100644
index 000000000..47c534468
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1343g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1343g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61053f606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x172fad1b36d2adbf98bf45829b39d6acae8b008f9b08c8ce5aad40f360e78f0c",
+                        "s" : "0x3e11ae0302da747b1e440520fb611ccf9cf625ed131082d97d821c2f620c7028",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1344g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1344g0v0Filler.json
new file mode 100644
index 000000000..19be7d6cb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1344g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1344g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610540606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x03cf9403ccc68d7bb6858441e21b369262e6189765fffe133bcd206bd65d56a8",
+                        "s" : "0x5e9c64e47d94da08f0af2307121707d155abdfaea932b38bca3dc85a68725aad",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1345g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1345g0v0Filler.json
new file mode 100644
index 000000000..b485f1f05
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1345g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1345g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610541606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb68c5bfc595053573fcdb158d0d483cd07be1654c8fe12d9dbf124839b89f2c5",
+                        "s" : "0x38bc147eea64db7bdc7b568d7a1d9e33f24bcb80b3e31fe88a3cf00662b9a9e9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1346g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1346g0v0Filler.json
new file mode 100644
index 000000000..0c149f469
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1346g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1346g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610542606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7511848639e185a71c0127c65fb3fecddd59e386fba00d18db711b99bf4fb87b",
+                        "s" : "0x2ff156c96a7ff63c37a93ca8301460f55b9b9960c098533dbf1e064d6c926de7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1347g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1347g0v0Filler.json
new file mode 100644
index 000000000..625f035b5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1347g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1347g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610543606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3394d194c962b9a6f4eb8f1aca842885adc13fe7a98a557c47ea7840a8598514",
+                        "s" : "0x27b94759bbcf132cfbfe7a46a20b85387e00df69fb8402a1fb89bc78c68cff0d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1348g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1348g0v0Filler.json
new file mode 100644
index 000000000..0b32bae92
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1348g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1348g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610544606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3d7441264d05a77bf9c23464740fd55c473b9f199ba6de4035e4a5d7a00321d0",
+                        "s" : "0x07275a45fab9216bc02947e26ecce5f9a8bff1fe821538a6f5df3443663e354a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1349g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1349g0v0Filler.json
new file mode 100644
index 000000000..5a6e3a700
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1349g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1349g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610545606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xefb5b14352c48f9f47f5b6f17da612d2a14bc90001f4e702e932f3609cdddcf4",
+                        "s" : "0x5940a844e26a4be186fcb5822a960179b2d1046d0975b524d98525f0561bea20",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d134g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d134g0v0Filler.json
new file mode 100644
index 000000000..b3f589d27
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d134g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d134g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60866064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7b996bddd2d01799d14f6cc51f98435a0dd957f36ada44c4aef5319b6a18dfb0",
+                        "s" : "0x2aa4cedf43b3b0e76c0113508b947d4776fecb691592f2b5b45932ec8f658973",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1350g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1350g0v0Filler.json
new file mode 100644
index 000000000..b5c292017
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1350g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1350g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610546606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdfed98bd001277abfac267c7982a28c1305c628f50eed972627c62cae2deacde",
+                        "s" : "0x7ad0b56c393a98ac81088292e61486f26def3c1e157f1682fb8580369ca59bd5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1351g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1351g0v0Filler.json
new file mode 100644
index 000000000..011a6ebdb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1351g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1351g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610547606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x95eebb2e5edb29b7fb59cfbab4bda01f8d5f6a947b071c45bd74f009730e3f7a",
+                        "s" : "0x04346adc1557b154afc049486e41ad457f039ae04982d7bf4c592e46cfd46b8d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1352g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1352g0v0Filler.json
new file mode 100644
index 000000000..bdc06049b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1352g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1352g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610548606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0c5b7add8ab44c6c11850b461e0d339b7a957e94c73ae42766dce367415a13eb",
+                        "s" : "0x5591c6ddf31bd338515a669a68f0fa8d894e32adf68b3bb8d9e73752edff9600",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1353g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1353g0v0Filler.json
new file mode 100644
index 000000000..f5304e1de
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1353g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1353g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610549606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe6e7b320f541080e30e7560fc9997938cdcf78d11c18a2ada7b960945abbbd1d",
+                        "s" : "0x43782777d887126c56b87aef73ef5974529999789de5b74876e3d7eb9911124b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1354g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1354g0v0Filler.json
new file mode 100644
index 000000000..ab5a9bc0a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1354g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1354g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61054a606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd51817b46a39e4c7d5e23b90a242e4a131664f2adc00eddddbb511af378df514",
+                        "s" : "0x3846e3bc267456a1163a2520911f1431593d71fe76ca2b326fb97bb28fba5e5e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1355g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1355g0v0Filler.json
new file mode 100644
index 000000000..e674a9656
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1355g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1355g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61054b606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe4f839d7045746c523f3bca7c5cd5f4fe810a4d112c1d358f704a9dc0c2d29cb",
+                        "s" : "0x5d0f153df460d85f48a0a8318f1a971cba2edece9d802d4cffc5be413977b33e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1356g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1356g0v0Filler.json
new file mode 100644
index 000000000..10288465f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1356g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1356g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61054c606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfd9be07d93b7f16d6f5014f7c3f94e43baea52db4e8158c7d79f32b59220f505",
+                        "s" : "0x708370a34450a39de928029c41393a370738af9d67efe82969718efc6fbd9676",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1357g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1357g0v0Filler.json
new file mode 100644
index 000000000..27be8e174
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1357g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1357g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61054d606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5eda909a3be8383fa37da538e8add3af787effd42bbf7a81d00e2f6a21283d24",
+                        "s" : "0x45079b8dc64a0d5486373151f66adc4e32d6cc00b3d8c6bf26da50978665db32",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1358g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1358g0v0Filler.json
new file mode 100644
index 000000000..e9da73e93
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1358g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1358g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61054e606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3e73ac3f6ad4e4e8fa4b6cc682f6850294b4715652aca866d49f61d03de1198e",
+                        "s" : "0x08a80edffc141d8823467a0aa21891f4718d5822dfa5602119b3f9b82510631b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1359g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1359g0v0Filler.json
new file mode 100644
index 000000000..6be286f77
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1359g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1359g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61054f606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x138969519ff65f94f9b826a29851051d237265fbd28a5eb374c1afaf474d087a",
+                        "s" : "0x1e9a44dac77c326052a31bba1affa093624933f41015d3b23dc7dedf88896262",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d135g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d135g0v0Filler.json
new file mode 100644
index 000000000..58778e37c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d135g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d135g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60876064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfc8cb46e238737e9dccc5d0cfce9fb91d30249d026544d5b53fabb4309089f25",
+                        "s" : "0x5923da91582187faed537a1833d707920d0ded18b53af32372415872abe8333c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1360g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1360g0v0Filler.json
new file mode 100644
index 000000000..91ed25665
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1360g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1360g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610550606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa57b39d1fa3a41187a7ff55182fd531997bab59e6f98d82684b3ecbb3bed8133",
+                        "s" : "0x676461c27e2d02bf1c12f81c3da958c58eacee5c5ec804f05292fc23c43bac0c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1361g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1361g0v0Filler.json
new file mode 100644
index 000000000..a119904a4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1361g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1361g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610551606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x94e3bc442e8d7dd2db7ca50da9b46c59710220adb71ac8c6f514a445deddd1df",
+                        "s" : "0x20649169574c5161f1d74311e8fecbf3bbb616084e701fadaf0c99038120ea90",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1362g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1362g0v0Filler.json
new file mode 100644
index 000000000..ee5a5b02f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1362g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1362g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610552606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf0fcf96c5eebd0467714d45dcad92b807810092ca1e139435832ca8d84816ee9",
+                        "s" : "0x36f2a3b294e729bb89ea98f01994a43537d80c0a4bd5137723592f4a3126e72b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1363g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1363g0v0Filler.json
new file mode 100644
index 000000000..8d39b1edb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1363g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1363g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610553606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x368927756f4febc02bbc043b2b7fb626bfbe6add7d9cfd94d0c6b40013ff7380",
+                        "s" : "0x6164cb00e0d027167510cd37c2dd988d1c327e26738e883f6112066ce10efca6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1364g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1364g0v0Filler.json
new file mode 100644
index 000000000..a852cf594
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1364g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1364g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610554606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9736eeab4b9bce700caf81521d349afee8cd7b2a813d9c65dd133ab4ee232b86",
+                        "s" : "0x341283e535c06a0d643b942dff9a168fd0d436543eaa935867cf7efcb0025acd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1365g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1365g0v0Filler.json
new file mode 100644
index 000000000..55c530aa8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1365g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1365g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610555606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2960da68f484cad907840a9cb0a23b12f7bc5393acf89b09caf06293932da441",
+                        "s" : "0x2e4d9c0e43f7962b4bc91abdce89e70d8724dcbbb50f9b792b4977d171d00a99",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1366g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1366g0v0Filler.json
new file mode 100644
index 000000000..fbdea3658
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1366g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1366g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610556606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x288471e3997c0c8c700acafdbbdc23cfd55667a62381ac5e854129dbe1f9e05e",
+                        "s" : "0x13758febe10b6e4793102b81757b5f6c27bf596a16d68163ac20abf1bb3f5928",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1367g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1367g0v0Filler.json
new file mode 100644
index 000000000..b740d230d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1367g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1367g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610557606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xff71bf8d3efe8941326f4f068c26884625d65658b9caad2780f18510d21d59a3",
+                        "s" : "0x66666128941001bff0d968fcea495d28d3da0c40f61e6c35c992b153983c15cd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1368g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1368g0v0Filler.json
new file mode 100644
index 000000000..3cb9d73ad
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1368g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1368g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610558606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xae1b82dce24ab9a7f43abd6e7ee08e3a3579e5032cecbd37700edf6bb249be5c",
+                        "s" : "0x7548cdec8bc622c5ff6dde18221bdbdc43af188b783d6ddfc4b9e39604527711",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1369g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1369g0v0Filler.json
new file mode 100644
index 000000000..23419ed01
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1369g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1369g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610559606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbbe08957a872d65a9ea9e4b0e0817115a5f3d71aa2a6d41a6b07d32d0a983f39",
+                        "s" : "0x76369c615e933fa24ff07b7267eb814fa8beda34db606a7830205c65a3a0cade",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d136g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d136g0v0Filler.json
new file mode 100644
index 000000000..3317b9798
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d136g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d136g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60886064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc67cf558f1ae7d06db91317d00f837c99510880bb2d28adc0c0dc2e24b5abff2",
+                        "s" : "0x44754c4610c80558fa32b56f563d129ad96627ddf04c361fa0e7e5c176b330dc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1370g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1370g0v0Filler.json
new file mode 100644
index 000000000..39ed96c30
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1370g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1370g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61055a606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6aa77138d6fc586ef8795fe6d2ea476e31d8002ea4c342f8b43db69336c71bc7",
+                        "s" : "0x586d81e3407ca18b6efcc9e44f0218efa70c7eb8c9c161adc2b78cf6ab41a0b8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1371g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1371g0v0Filler.json
new file mode 100644
index 000000000..fbf0796d7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1371g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1371g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61055b606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x378a47e0f3fac0a782c74901753115a4e7e943b11df20e132c3221535be7b65b",
+                        "s" : "0x45beb460d529310246380fef492425b67252ae81e52a9ea828c97a5a60817d9d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1372g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1372g0v0Filler.json
new file mode 100644
index 000000000..0ce688f47
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1372g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1372g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61055c606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaea3bc77fb8e1182c92dfaba30e40420f5621a510a35d38037d25de8b77e4187",
+                        "s" : "0x5c8e177cf8fd278b0afd4efc0769f23215baf3e8c83d6fffd92783ac417df709",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1373g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1373g0v0Filler.json
new file mode 100644
index 000000000..c04a9b04c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1373g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1373g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61055d606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6019618229a6eeee5ed11b785a3b458d693d3d73c241a4a8f6f3ff7506271cdc",
+                        "s" : "0x1203ddb40cc6021fa6439dcf62a9a4fdbf0d09e47c0fb3e0d91ea14a116878a7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1374g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1374g0v0Filler.json
new file mode 100644
index 000000000..5757a357f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1374g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1374g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61055e606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd9ec71013b9db5fbea124024973c26903cee91deeb46ae365524b7feb6597215",
+                        "s" : "0x4351e697df5ebe651b52597958408582622d67089964e46ce90d5690b3e0dfb5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1375g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1375g0v0Filler.json
new file mode 100644
index 000000000..4b74b6cc8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1375g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1375g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61055f606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x869c3febec1ca6ddd10373bb086215e27ede569edc51975773e17ef5bdef3be1",
+                        "s" : "0x74bb2be132207ab4e25d4673a6762477d9a4abeed15c061f8e0a040e27bad320",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1376g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1376g0v0Filler.json
new file mode 100644
index 000000000..cd00fc820
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1376g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1376g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610560606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfbce8a51acdfdd4761f8a2de3501194257e8ff5b34bc6df3a0821912c7d847aa",
+                        "s" : "0x75dfcb84a809bd0ba317ef962f62cb4af5a9769900cff827dbdddfaf8263b022",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1377g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1377g0v0Filler.json
new file mode 100644
index 000000000..902f95ff5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1377g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1377g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610561606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x826dfa5f33ff6a191904db16624384a35c672fd3e217eba2ef7911e8ab3a46de",
+                        "s" : "0x3bb817b78b5218b1e39a4b96918539aee5da2b2093dd739a81cdef0d4f6a8ed0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1378g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1378g0v0Filler.json
new file mode 100644
index 000000000..1da721680
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1378g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1378g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610562606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaae3b34b511a8a5e754372770e54d95f560f7c021bdb9829d939b57f6560ce34",
+                        "s" : "0x1c0b127e84522d5f828a9636ef60880a363f97814f9cc7df688d9cadc26557bc",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1379g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1379g0v0Filler.json
new file mode 100644
index 000000000..8576f030a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1379g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1379g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610563606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbb2951513a504a8a33439874745e687ca9383150845ac8d57c3a75006e271fde",
+                        "s" : "0x3ac4ca735d89032eb84668119fb73e4693fcd21c7ac739e5ff95deecd6f53305",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d137g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d137g0v0Filler.json
new file mode 100644
index 000000000..74ade8846
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d137g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d137g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60896064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4d649112173a60fc5e9e11ee9060b1157ef0ec93d60a3a90c63bfaa469a835d4",
+                        "s" : "0x44f0dde81a35bfeec71ff71e0efb075ea4492baab1bef0461f8d553bbb743edd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1380g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1380g0v0Filler.json
new file mode 100644
index 000000000..84dccc8c9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1380g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1380g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610564606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x037bf4beb7630f4b99ad05d1e318fcd9443ab44e223b0079f9b4b343b85a78c3",
+                        "s" : "0x1c219dea32110e4eb7b3f801ddfcad5e003c8257da35f9e2970902fc3c562f83",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1381g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1381g0v0Filler.json
new file mode 100644
index 000000000..1b14942fe
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1381g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1381g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610565606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x30cacb5ee97ddfa0e647741b0342c286a63ad891952813fe07a8e46d6982197b",
+                        "s" : "0x6c1f30793b49b4a5e1265f78c7bb2e49f4ce254b0078ed6dd93f3afb2133c1d3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1382g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1382g0v0Filler.json
new file mode 100644
index 000000000..0ece17dde
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1382g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1382g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610566606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc7a728aea99ab0dbcf369f95d0aef7693fb5a50ac6efe577e3d600936878b675",
+                        "s" : "0x31fcff4572b9cb8462f54922185e057ac7de7e60d66c6a2e9f857c350c51663c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1383g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1383g0v0Filler.json
new file mode 100644
index 000000000..b0a9652bb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1383g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1383g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610567606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb35ed85f9932c036839b11da3027d3760bf3d930965d6b8591e6837ac4705fb5",
+                        "s" : "0x1ad025d8e0824c96fc15395a429d7c46e6b8ce254e6636b47db035efff504d98",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1384g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1384g0v0Filler.json
new file mode 100644
index 000000000..093936c2d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1384g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1384g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610568606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x01fc8727529e772977ad2ad350cf2d355aaa5117e5bd34a442242a425dc5454f",
+                        "s" : "0x5487bd722369aa2719c08f181221092ef9385318fa3f56ba88e020ad923bc81f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1385g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1385g0v0Filler.json
new file mode 100644
index 000000000..c57dec181
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1385g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1385g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610569606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9d255c2a6a8b44456ba23ebffc518e2dea40aa2f01399873f0b1febbb5ce47a7",
+                        "s" : "0x143a4a11d43d2a6a09fc6039982ae21ec0f712bd7f1a060406cf81ab7d59ad75",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1386g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1386g0v0Filler.json
new file mode 100644
index 000000000..beacefe6b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1386g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1386g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61056a606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8aedb1a4e4905b2624e4a1946040ed20228516a1a188fb24cf083e38b24e03c7",
+                        "s" : "0x764d5e2e5b219bb4b17bba116d17968f7e936569acdfa54849fea1ee08b96ef9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1387g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1387g0v0Filler.json
new file mode 100644
index 000000000..42ed80f3b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1387g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1387g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61056b606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1893407b4b7c5397e7918235f234d8fe5a51a03f59ef7506561e34781cedd63c",
+                        "s" : "0x5ccda772a65b8c18d13ed44b7a9ff8eafde3aa932265fffa52262f01c09a75a4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1388g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1388g0v0Filler.json
new file mode 100644
index 000000000..978fe49b8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1388g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1388g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61056c606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4f6bb9532834c53adb1af45abf310cb98bfc1574b9287c39196a421d43628c42",
+                        "s" : "0x18c052022021fd0b5344aa29d47e0baa28aca6b96bb58c64abf19f57b0c74cc4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1389g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1389g0v0Filler.json
new file mode 100644
index 000000000..04c0f6e21
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1389g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1389g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61056d606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9ee0b1facfab3aa174d46b98b7c7212f0a3be9e12d8885188509578cfb900d43",
+                        "s" : "0x0400896a3d6bf1266bf99f37c92b2b41b84f9d74a744c886db96e84beca7664b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d138g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d138g0v0Filler.json
new file mode 100644
index 000000000..f7058a64f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d138g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d138g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x608a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7fbcbcaca75b5318695a0634a9e23271c9734e36879a80d7708772e063776dd3",
+                        "s" : "0x0203a0c14cdf4111ef78f7239221715e86674dd880686191c63f9d5177abffe6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1390g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1390g0v0Filler.json
new file mode 100644
index 000000000..46529d92f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1390g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1390g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61056e606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe08a887ad9514137037fb92b1ce9559b8a2c1af236a5753b93d1ee97bebc51cd",
+                        "s" : "0x4a60936dec3d02c2e2fbeb6cd0a3b8d25a430fba3f8af71b11e1a73e14f8a591",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1391g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1391g0v0Filler.json
new file mode 100644
index 000000000..3d8716c85
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1391g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1391g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61056f606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x981b38e7af63f0ddb7d891bea4ea16c959659d98f161c022f1c747f566be5e28",
+                        "s" : "0x51ae113e83b874f54248078b7a3c792051db5d9c99f55323d872f51cd6d58652",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1392g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1392g0v0Filler.json
new file mode 100644
index 000000000..9455e0ff6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1392g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1392g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610570606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2078c7d01ec24e59ffd9690ae6a64d4e230b4e1fabb026f242119d0b26f37b76",
+                        "s" : "0x6786047d7e35bad9c71c8b71160ceef26ce9705e500576e4052dc763c73ef208",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1393g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1393g0v0Filler.json
new file mode 100644
index 000000000..4eaa29058
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1393g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1393g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610571606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb1156721fe7af11bff9b756cb3dd55d66d01f266b9c2d1cfcf18747248bc4260",
+                        "s" : "0x204d9a34bd250d66d94e9877bcc8b514c3ffe09eafbf6f7499dec199ab829030",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1394g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1394g0v0Filler.json
new file mode 100644
index 000000000..eab1435c1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1394g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1394g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610572606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x50a441c1f3db4d9b879e142558c4811fc8f9cdb12f64d4bcd9728baf186c908c",
+                        "s" : "0x43db362e9de146d4b00f33b4780c72ac0a1476964f403bd12cd4b8f8ef3a608e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1395g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1395g0v0Filler.json
new file mode 100644
index 000000000..cbb9f5d72
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1395g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1395g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610573606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0db501351cc651659306fdca8181da72b7e14f62002ad2aec85c02119d81de58",
+                        "s" : "0x39ed593e5978cfff008a81cf315153b0f0679994ee3a98703a41f7b2fbf4cab0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1396g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1396g0v0Filler.json
new file mode 100644
index 000000000..408f7d033
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1396g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1396g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610574606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfc20a129879ebaefa5c85203bd1eb63561598a1caca0e1afd92eb569738e6056",
+                        "s" : "0x695c84d96c7c9618ff2add4bbbd81e1dcfbb88610068f5e5f469c47b5e8b5511",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1397g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1397g0v0Filler.json
new file mode 100644
index 000000000..bd28c4f05
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1397g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1397g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610575606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x88a466da2322d4c7c80550b370ea7a2b197e9e9655fd8bf8a66c4602e13a8acf",
+                        "s" : "0x02c58f4ed4485f3e1724cf93a76cf62c76cdde3dc19d632577b0a18b725ae4d2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1398g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1398g0v0Filler.json
new file mode 100644
index 000000000..6350021dd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1398g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1398g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610576606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3cd21d6b469e78979761998386de8627f41a3486f68f4ba2389149144b9d7e94",
+                        "s" : "0x20143c9e08ff7e6b623142cffeccae9338a838e1e7c123c0fcd9e65274b367bd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1399g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1399g0v0Filler.json
new file mode 100644
index 000000000..88a3b0eda
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1399g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1399g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610577606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x56ec4f53d23716bdf4d9bc37867c409ad7e6409065d321fe110fd4f545f18d01",
+                        "s" : "0x52b9748ad364585d627cdf39d77a74cc8aef4d380769f654e5d37c0c55adefa8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d139g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d139g0v0Filler.json
new file mode 100644
index 000000000..40dfdf78e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d139g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d139g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x608b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xad65e604f1d3970f0d332527571565c0b91ffa01e2fb1699170e48371536b7ed",
+                        "s" : "0x747f575525a3fe47f3c60a4a09d4db535616249e1a7b81c69b716d2c3ca9abc1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d13g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d13g0v0Filler.json
new file mode 100644
index 000000000..4dd6fe98e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d13g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d13g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x600d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x433b592ba4d89254f38fba8b5f9268e963a7ccf70294dae7ba42b51858f2fac8",
+                        "s" : "0x30c13d20e8023d11ab36b8eba94b5cd54346b64a863bd7c51e8ef152d84c16ac",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1400g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1400g0v0Filler.json
new file mode 100644
index 000000000..cc2051eaa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1400g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1400g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610578606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf93c4de18ad672507b95d15cab84a8675f1b1d71f6acdac8f4a9f2b0da7758f1",
+                        "s" : "0x5c065c40f2ac417dcfdde1b565e326de7104db1f34842267ce631c73d5c7d8cf",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1401g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1401g0v0Filler.json
new file mode 100644
index 000000000..d078765b0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1401g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1401g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610579606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd3cf168ae146046c73555d806c58d1e293266a5f2977067bfe5bcb1f28c2714c",
+                        "s" : "0x78f164bcf06721dac2cc7c9a4afee1064818bcbaf632f53b5aee5bf5bccfe28f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1402g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1402g0v0Filler.json
new file mode 100644
index 000000000..940337a1e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1402g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1402g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61057a606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc70b3f41806388cc16c7a41baeff99dcb6e40eb9c8fdbaa0b5f0560cf4b9e953",
+                        "s" : "0x646f4cc20200da7c8e86f110e7d6e60d3d0a8e5d01892c1f205365a3ba3f8e08",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1403g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1403g0v0Filler.json
new file mode 100644
index 000000000..02427b082
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1403g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1403g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61057b606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7c03d1a43cd91023009a2d58a8a34cd944a94522320704bc24a127b6b1cdf0bc",
+                        "s" : "0x3c3e1ca851b122b667cacd0750307921879d61d43e02fff72ce1be61114635c5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1404g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1404g0v0Filler.json
new file mode 100644
index 000000000..5b997521f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1404g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1404g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61057c606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x967a9da99c5c9369cae13f3c6eb181855b0d7590a9e93204a8e0aec010ddceeb",
+                        "s" : "0x442a637f50e45e3ec68cced904f0b1dce2dccb57b07e7366d906dd3a507573d3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1405g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1405g0v0Filler.json
new file mode 100644
index 000000000..95074451d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1405g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1405g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61057d606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6157e2a65606c5b93e777303bbc18181363ef840db09d7fe9d58d0752247237d",
+                        "s" : "0x3ebdad8892d2bd09e636b5dd609785977919229e0ec5c8244d87d62685d7e976",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1406g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1406g0v0Filler.json
new file mode 100644
index 000000000..b83f34b3f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1406g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1406g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61057e606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1ad0479748585752386e9bf59eede4e91fbf62f55c9bbfa0595cd8050c17f619",
+                        "s" : "0x36c7cd26800c7884717b8c999cf270bd6d08aafc9efaf9b2686557ce51424235",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1407g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1407g0v0Filler.json
new file mode 100644
index 000000000..a4bcc528d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1407g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1407g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61057f606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4b0b964e1eb14ab50de3ce2da455ec00ace354b58a012cc63452c82ab120ca6b",
+                        "s" : "0x1e3487921cd8fe7613a2c29528b5d9c1a59226f15b017a6118be6e0467de1279",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1408g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1408g0v0Filler.json
new file mode 100644
index 000000000..e3095ecab
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1408g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1408g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610580606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x09decab4385a0235354bfe4792d7067f211731dc2cc94caee2f322ff500147a5",
+                        "s" : "0x04a7b186e4fa3469d7305932c37f8d956e1cf7fb708798d048f0d16e0f686c6e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1409g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1409g0v0Filler.json
new file mode 100644
index 000000000..69937a971
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1409g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1409g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610581606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x26d14a2b5a1897c56b788561074d5974023a3248bcc118f9557033b4d5c14b16",
+                        "s" : "0x353dbce7390ab4b46c623c819d597e875fe962b9cd4a653f121b8b2df4f209cb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d140g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d140g0v0Filler.json
new file mode 100644
index 000000000..8403d0e6d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d140g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d140g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x608c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x68994fa12cedbee398400ce081af7ee9b97588b3f011a03cc81ad41dde01ea4c",
+                        "s" : "0x31e105dbc1809b8d4ac322df6f12bf9eda00aeb3b383047aed7f565389c612a5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1410g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1410g0v0Filler.json
new file mode 100644
index 000000000..a689510e0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1410g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1410g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610582606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1ff2f42339c873d3a9e6dfc024033316c27c3e1a63b30d5446815ce29b53eb45",
+                        "s" : "0x0df95d8c73cc976b9233385a9d0dbce7dae491a8591a0963703f0c432e7dbc69",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1411g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1411g0v0Filler.json
new file mode 100644
index 000000000..c83ff2c8c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1411g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1411g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610583606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x060ecc8d3ea00080d1e123ad3f10ad15654a3350362cd521639d5401fd170501",
+                        "s" : "0x624ad34496b702b4723e398deba3e4eb9e0a70d62d67b536b7cb19663c430399",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1412g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1412g0v0Filler.json
new file mode 100644
index 000000000..94fcc7117
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1412g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1412g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610584606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe94b4d834d384d795ae575ef6e59d8792433c4adfc46906040480780c999ed84",
+                        "s" : "0x0be07a54adebfb6df7758eccc9ea012079b8923ba41efe8bfe835e4e5f1a191f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1413g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1413g0v0Filler.json
new file mode 100644
index 000000000..54e046e30
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1413g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1413g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610585606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa2bfba826d7397c7ff727d08f818ad02236d33a05779155b3d7f138812a13fc6",
+                        "s" : "0x51627066fa64dcf34b70b7f3e79615c93e21bce2fa889eecef850a9f58dd5a76",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1414g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1414g0v0Filler.json
new file mode 100644
index 000000000..20d73412b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1414g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1414g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610586606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x035da48f4430641d62166a478e5b6c39350e4039cc7d7651fc0205303b43849c",
+                        "s" : "0x38d0cdabb70819495b8c54ed1826adf2c563077807181f8ddb52ff03af3f2958",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1415g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1415g0v0Filler.json
new file mode 100644
index 000000000..079cca6f5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1415g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1415g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610587606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6a82f715ba8a9719ee6baeae3865483d63037e4deed6cf632100d5b83ab2aea8",
+                        "s" : "0x3399f52c0ab7cb2bb3b5b33b1003f5f7703e6ce456b6881478db77c197f17e09",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1416g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1416g0v0Filler.json
new file mode 100644
index 000000000..e75be311b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1416g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1416g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610588606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x28bea081a3fa18e12aba7c4109d6f43dfd25de1e9eb94eb6d5922036941d0919",
+                        "s" : "0x4393740f63af365402313c2c931aa94b6be8615227af56e0b3699c3b0a6edaab",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1417g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1417g0v0Filler.json
new file mode 100644
index 000000000..be16ae373
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1417g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1417g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610589606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x94fdf6735b63309a3905ba4e1a91e363ad400348842903927d1975441c55cc97",
+                        "s" : "0x02e3d657ff2bebc18c0ca2c44c69a621996e4873ac63139d4d5774d399e5e872",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1418g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1418g0v0Filler.json
new file mode 100644
index 000000000..7d000193b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1418g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1418g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61058a606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3ef73c383874642ddc691ac418b551461f254bd59d85e174d4b233e86804584d",
+                        "s" : "0x201128e1589a312bf4bb85bad7aa6f77b6ae02141a140ac5c887d2163e146f27",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1419g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1419g0v0Filler.json
new file mode 100644
index 000000000..6376b25ed
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1419g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1419g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61058b606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0b458e750cd3aae4e3dcb2ed185325dabaf4cd7842c2f27dd520556742af8f68",
+                        "s" : "0x3e697e5be14b532b81022488d20d17e0b4142a5ae201e64347396ddb28e28246",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d141g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d141g0v0Filler.json
new file mode 100644
index 000000000..47cd824b9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d141g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d141g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x608d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9573e0d93f9dc1eebdc29d65b6f0fa96f155a2d0ba8330152b7c22f5f470fca5",
+                        "s" : "0x490fec89985451d6506f5dcc3167049b2e814170ab7d1d1ad8698d02b783eee1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1420g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1420g0v0Filler.json
new file mode 100644
index 000000000..1d83d13b8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1420g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1420g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61058c606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4ef6b97efe858755965e25ca387db39dfe7753e275347a2b2d6f1de3452d62c1",
+                        "s" : "0x4a54efeb9b89fa2a032dcc919ce6e45e89ba6c26f88f0de6728f43aba8468ac0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1421g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1421g0v0Filler.json
new file mode 100644
index 000000000..0c0fea194
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1421g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1421g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61058d606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x176e79898cd7c24fe2815a6cb0a205ef3fb745a5983e210234ba0eb1c2cd0ab0",
+                        "s" : "0x09d522b5d65e9ba65daaf32f961251c46c5b9cd915f82aa337891890180f7721",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1422g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1422g0v0Filler.json
new file mode 100644
index 000000000..2387f3526
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1422g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1422g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61058e606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc476b16381e3955b8a5e051719bc3f31c54543f583a1cda6e75b20822613efa5",
+                        "s" : "0x79cd9bcb80c7219585fd81f39d1bf6a9be9398abbdfc1f41a80eef86bdd48a7b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1423g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1423g0v0Filler.json
new file mode 100644
index 000000000..15b84fe25
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1423g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1423g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61058f606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4b13b53a0e35029d576d6c628ee1dd21212f1ff10351d51b13a8577efec6afa3",
+                        "s" : "0x222faa56be1a46b9f473cdb5dc169b3c8d7c368498ea4b1446da0e6bf64f0b3c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1424g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1424g0v0Filler.json
new file mode 100644
index 000000000..e2734d656
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1424g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1424g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610590606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x257b551de9c5cca9fdedf56590e8ab3a7d5fb861109c73e36d62fd8bc18592aa",
+                        "s" : "0x474c07878c5d7ea0d847f851690a986872768b5aecb36b745df996dc4389a33b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1425g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1425g0v0Filler.json
new file mode 100644
index 000000000..b16d59d50
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1425g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1425g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610591606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xac59cd9f453ce5c7a3e74e5fa0db853180bc241465569724471a1fa7fe04f1bf",
+                        "s" : "0x1d033b7c60554a546aa02905813accc7a73ee91739cd6339dffa5e60096e6706",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1426g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1426g0v0Filler.json
new file mode 100644
index 000000000..5987937d5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1426g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1426g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610592606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfa5e1127d0c77c70138f421b0f908c1a15018e11bda3109b8fd77063fc79f04d",
+                        "s" : "0x08ebb7e731a2fa0002ed2c775c9aad0d759b1527c19a24dd55d29124f852bc8e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1427g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1427g0v0Filler.json
new file mode 100644
index 000000000..55cdbf843
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1427g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1427g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610593606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc13a278cf500220f29ddc594feddcc755d4fa7c9c60d71f89ab767d280b7a65f",
+                        "s" : "0x7a1d957a2c7ce300082c2c4b2c4d6bd5df7f4c80cc4d7c3a3053884244806491",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1428g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1428g0v0Filler.json
new file mode 100644
index 000000000..951fcb011
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1428g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1428g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610594606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x01a56a9a9faba9afa9bb12c2f39e1a1b46756758590240d325952d6be98f63c6",
+                        "s" : "0x092f13a8bb05f29e42c4050b2e596d3da315c73dffed3ccaa008f3c41c41d509",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1429g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1429g0v0Filler.json
new file mode 100644
index 000000000..707103991
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1429g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1429g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610595606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc179c8cafa6d8ec8752c9ffc21b5b869cc05a51529f8092a6c5a408c0e0d4179",
+                        "s" : "0x2c7535c933d23559113f8de899319173441653c7a4a2071c3fd46403acc9d47a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d142g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d142g0v0Filler.json
new file mode 100644
index 000000000..bb122dc64
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d142g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d142g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x608e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9835bf56e2c6dcbd66d5b2bedc24181e71544a53377316437b53b1bcd7fdbb69",
+                        "s" : "0x6af8acdcf0c37b5c21b8e412192bdaa70755067ac45798c4ea28b4bed7d18a3b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1430g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1430g0v0Filler.json
new file mode 100644
index 000000000..d8e913506
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1430g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1430g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610596606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb30b104fbc690b2b7f6f6b544eee3eb76bc52d0b4aac622ae95842463e9910f3",
+                        "s" : "0x55c9c266c497548f8d979d4880c426491bc55b0cdbcc5da71c5794adce2ce0da",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1431g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1431g0v0Filler.json
new file mode 100644
index 000000000..cec93b282
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1431g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1431g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610597606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x228a38b05d1f3aee70d65a70d8918b17cc3b47e84a583dea18a083dc89915761",
+                        "s" : "0x45cc25c287f06451675c2a5c154a05f4eb55ba5b1d70b0db4f48af268a0de268",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1432g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1432g0v0Filler.json
new file mode 100644
index 000000000..88c073367
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1432g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1432g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610598606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x940e0feec9aced9aa158c152a85953747e05c140e3758868921d894fe9d5f6be",
+                        "s" : "0x51a5dc84779acb999d2aaa6bee7cc8cccd5c260d47e2f6f11cf8b33a3de57543",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1433g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1433g0v0Filler.json
new file mode 100644
index 000000000..4a75a4cc3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1433g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1433g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610599606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb3cf302919e4a517bc5a5d1cc964daaadea9bb6ea85f2265b59391c46152d0f7",
+                        "s" : "0x0edb66e9d9b455477166e00cb6116c6a4b0c78ff6ae6fe1d4c23c87cb430593b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1434g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1434g0v0Filler.json
new file mode 100644
index 000000000..c4676a4d4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1434g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1434g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61059a606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8c0cda373604e66744d31f71c821ca08fc0ee3e979e1984590cf6f59c4641ee9",
+                        "s" : "0x7fdbf88f3e09e2fcfd843b13d3775c591f468c3ab2dff459122454dafd1862f4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1435g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1435g0v0Filler.json
new file mode 100644
index 000000000..84444aa8e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1435g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1435g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61059b606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc8a2c44fbaee650e3487a83b22405aac76b49a4eecb41fa6bb718f72449c3496",
+                        "s" : "0x2ec8fd015ac0bebba55909773fc81c05a7062b52c7eaebc2a0c6877d72d6d841",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1436g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1436g0v0Filler.json
new file mode 100644
index 000000000..6d97c5411
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1436g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1436g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61059c606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc0c5e5aae13757e87c211f2c1ad545dc2399f6a3c2db6238f71ddd058a1ea7dc",
+                        "s" : "0x1f8a8f13c7df8af69b0865f0bc7f75453b79841000d569872ca65e49c99ccf2d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1437g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1437g0v0Filler.json
new file mode 100644
index 000000000..aa2f02a5f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1437g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1437g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61059d606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xea3a7697684f98251834ad493dadbcacbb63661d1747df21fe236088a5d619f8",
+                        "s" : "0x48c4dc9a950eb561d789f20622772480e4d3cbe23ac8f5d2ce30614549d34a7b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1438g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1438g0v0Filler.json
new file mode 100644
index 000000000..fc8d0d02d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1438g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1438g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61059e606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x23c1e748a12c618c7d6cfdbd1fd76036dec68c3179d33c8491c76a7bbc4d7d25",
+                        "s" : "0x56d4de3d5beb7d88c52e7fc97ea0ec165ddf21df55fa5a1ac94f4d98e6254c14",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1439g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1439g0v0Filler.json
new file mode 100644
index 000000000..21e2ae7c9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1439g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1439g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61059f606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9446c4aa260cc70b5328c0b0f7e8adfc21e936f4af69ef77b5b8e420a4a6dce2",
+                        "s" : "0x58760730374d53b8f4409d51c01248479917e3d720d6a6bd0b0441dc67d6feb3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d143g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d143g0v0Filler.json
new file mode 100644
index 000000000..c113c7ce2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d143g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d143g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x608f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa5bc474e315543609e474d1b060da8b41e4dc58f88793401c9f531af1041add8",
+                        "s" : "0x07f1f29d0593d6f6dbfe34d4d376e07cafddc493c0ca4cc68ecab03eb746f9fc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1440g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1440g0v0Filler.json
new file mode 100644
index 000000000..9746f4a34
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1440g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1440g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105a0606452600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x45d633c74e8b46f1840dc505664bf17cf143152ce38524243c7c2139a4292ef9",
+                        "s" : "0x528783e1bf013f6ba41f593686c77e92484b994c750fb7f538c5b9ed5129fbda",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1441g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1441g0v0Filler.json
new file mode 100644
index 000000000..00b862f71
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1441g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1441g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105a1606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa31a3a7481bb3ae3dd1b12002ac6f7b8e835bc8872a054ba86489861a04a080b",
+                        "s" : "0x0832359a2d2b166e3f5b78cc7dd7da7b7fb9118e70e4c4d7641c736863f4b65f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1442g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1442g0v0Filler.json
new file mode 100644
index 000000000..a4b402730
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1442g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1442g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105a2606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x46ac7c20415090f9d8d2c0f076deec2fdebd877a7713046ede112d1910f802af",
+                        "s" : "0x40a4649b7ecb3f0479fa3a28d9d7abd00054ee88c4f071ba9c7cf187d35a225a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1443g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1443g0v0Filler.json
new file mode 100644
index 000000000..8e31eee67
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1443g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1443g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105a3606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa9db18bde76778808fe5594f34ec6ca203b476cde04ecd9b83506b5cc691a6dd",
+                        "s" : "0x02361b995e067abc6527a2e71344758f53012436d155a7fa5fab3a791ef3d30a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1444g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1444g0v0Filler.json
new file mode 100644
index 000000000..84335a86b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1444g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1444g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105a4606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x53a82f852cc054297280d1a91b178f5ed1d2b91cc0c55b0e4bcbc15bdb74e23d",
+                        "s" : "0x3b5aff87bfd5f0033b5e4288274b6a3ae902f50bdaff55a6248b488110c4ed3a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1445g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1445g0v0Filler.json
new file mode 100644
index 000000000..8e6addbb7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1445g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1445g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105a5606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6f0557b777e7cffe4d07f0c190dde4467e9b82a5bebb410f7f79871ca2d7ae9a",
+                        "s" : "0x467ef3389b741f39ab56df6a489a5aad6afc52009b3b34a2158b4c3459d6d69e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1446g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1446g0v0Filler.json
new file mode 100644
index 000000000..1c4a525ef
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1446g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1446g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105a6606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x66263112ce08548ba2eee483a1bbc2766efcac4c3f4f9dc2cd8a77ccf68080e5",
+                        "s" : "0x6afc1402b637dcf716107fca46024c59418457a35ae9609f080d8048addaf996",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1447g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1447g0v0Filler.json
new file mode 100644
index 000000000..089f4a46a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1447g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1447g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105a7606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd2ff02f2359334d26474f7e664f029e305525bb8fd05882abb09a08d1d2d11a7",
+                        "s" : "0x5175b0bf730668545b362f918229e802064792203e45c8b6f2aecd07dc701717",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1448g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1448g0v0Filler.json
new file mode 100644
index 000000000..c496dbcd7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1448g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1448g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105a8606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x67d38e19ab677da9d45066cf1f74df68b47d136479ba4b9229092f9524bfa715",
+                        "s" : "0x3acae1bc22f07ce14757da447782ba5309dc362304fcde8f04eb4ab4e5745687",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1449g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1449g0v0Filler.json
new file mode 100644
index 000000000..861cc95ad
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1449g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1449g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105a9606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xea66fb9a8e15500b5ccf288ab033b03b3c091fd997cb1e49ae92c30117ef6d9d",
+                        "s" : "0x767980bb9b8d0a55e0798b430227c3dc48ed4b9680a72f016c6488d1582a0e8c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d144g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d144g0v0Filler.json
new file mode 100644
index 000000000..cb6653e04
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d144g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d144g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60906064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x571eef32fbe0f475625cd1e321119eb3b294bacdf35ea6fdf5126e32eabb68b7",
+                        "s" : "0x660fb5be0d0f10e584df1ebbb2df0af690ad1a86c676426223f97fde6456175d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1450g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1450g0v0Filler.json
new file mode 100644
index 000000000..529cb6230
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1450g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1450g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105aa606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x078dc32e64ddea9638419b0b62fbaa598beda8f340ed8b4b33a3d611ca4bfd0f",
+                        "s" : "0x6682ef0fcc735045d894b3b7f194f5e30afa1b5b3ec16494f3822fa8b920d981",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1451g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1451g0v0Filler.json
new file mode 100644
index 000000000..9b462f962
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1451g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1451g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ab606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x616bff5d90641b6dc72cd15cef0864a2dcf8e92bd1561d9d1a4ccad9bc79b7e5",
+                        "s" : "0x41d462d781bade6d7e85d148ff51970dd719b678000f04574b582f33810a68f4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1452g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1452g0v0Filler.json
new file mode 100644
index 000000000..f11475d7f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1452g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1452g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ac606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa08b4e8a720e4a98cb04809ce5e3242844327a0e0f44c6be8e262f4bd9b3722b",
+                        "s" : "0x5d1622ceef5c0be22e6fbd1df2cb53856f33c7232680c3c599f5c6429a0f0a7b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1453g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1453g0v0Filler.json
new file mode 100644
index 000000000..350ddb860
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1453g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1453g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ad606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaab38777a83a763cac290ace4b9808e83f9216e03ae7cb702829842bfafe2819",
+                        "s" : "0x733655ff6e4e6ac9eaa4da37f230cec526c731ab9d9144c618fa78b70f3fa7bd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1454g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1454g0v0Filler.json
new file mode 100644
index 000000000..6aa7211fb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1454g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1454g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ae606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x976544ab5e6176a88fc5f707d995f93ff46b126efb9a289df411ebd8c9ed81ab",
+                        "s" : "0x1dc2551c642bff8e74e7cc6d5fe2c7b455b9c80ff59c8cc32031c3fc2a341e46",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1455g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1455g0v0Filler.json
new file mode 100644
index 000000000..349b44f93
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1455g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1455g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105af606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x06238d497dffc288c8557b4891211666d66857e8dc9d557801f4900403d44a63",
+                        "s" : "0x6aa9aeb9ebe2259a33f3f13ac669960432f8978b2a830a1fc147c7bd1f798ea7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1456g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1456g0v0Filler.json
new file mode 100644
index 000000000..df3cb21a6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1456g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1456g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105b0606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x53b3c48bd5faf26f06df1657b0e2ec11de66d9385a9d695b55c09c8c1c8ac054",
+                        "s" : "0x21304f9a9e369a908a74c04d15629c87dd41b2afdca91938d52d90fbb915facb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1457g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1457g0v0Filler.json
new file mode 100644
index 000000000..0a6d1481c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1457g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1457g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105b1606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcdc794dbae37dc9721da35c4b96ef84250d5b629c50623002d56281be1048c38",
+                        "s" : "0x5954bf821b094923e13c402b97665753bc4485513718bea15e903707abe877a7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1458g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1458g0v0Filler.json
new file mode 100644
index 000000000..a45b0968c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1458g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1458g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105b2606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe57fd6296c28a06946d099f96dcb5285fc08b99433a2dda58b02e6453183d8f1",
+                        "s" : "0x9fe55b39eba41780a92442d7393264ed1bc95a85441272e544e55f35c56b0f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1459g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1459g0v0Filler.json
new file mode 100644
index 000000000..03a1e1aac
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1459g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1459g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105b3606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x26afd185ae00e41d9d9dd2339c7923b862efebcdd012e8343e11c1b95b1780eb",
+                        "s" : "0x3b09ab0a0f121886e107cca37101f7c139bdf698e145ddde2242c288142a3dc2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d145g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d145g0v0Filler.json
new file mode 100644
index 000000000..697ac4024
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d145g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d145g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60916064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa8f9ef22ee7e6b49cf5479f687769c89879dfd4ca2c96ea1b133e9e3709b19a0",
+                        "s" : "0x593bcc2f382b00438fb3c21b565a3382daec2dcfbdd559a8d25026afd3977a66",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1460g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1460g0v0Filler.json
new file mode 100644
index 000000000..9742d3b84
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1460g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1460g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105b4606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x313dbb4096c419d3a6fdd4a9b1102cbb0cdd60fb514ed1e8a2d14b9efe0cd13d",
+                        "s" : "0x74b7fc0cdeae1f59f51aef0ad130243fb6c5f87d20ff023a628fea0ae2d6cfaa",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1461g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1461g0v0Filler.json
new file mode 100644
index 000000000..684f06ead
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1461g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1461g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105b5606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xda29cb997bf2d057140031b37be917b810ad5bfa50822305becb6d159496d1dd",
+                        "s" : "0x798aa7e3527a104635525b65a750e8f5f8f902ea21e9149b71660b408569ce88",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1462g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1462g0v0Filler.json
new file mode 100644
index 000000000..6534570b0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1462g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1462g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105b6606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x211447c60b7265d963e4e8d3fbd748c88f6ae50c3d8cfcc854cc3d356d12e762",
+                        "s" : "0x53947c04c18b438c5bb9f80bca2ccad3b72fe4b788ce6e4da9b2848dba56fa18",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1463g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1463g0v0Filler.json
new file mode 100644
index 000000000..9c28ae7bc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1463g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1463g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105b7606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x37a890171b004e1b7139ca5d6cf71b2ae26ea4b2e5ab2b9037e69a7d9d484732",
+                        "s" : "0x3dc647c48fc58bf3ee0ce17c67aa420c74224fb9a554488af864046009b7b5f8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1464g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1464g0v0Filler.json
new file mode 100644
index 000000000..cf7ccb086
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1464g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1464g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105b8606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6f646bfd07a6677b8e05349889758b6b3467dbf5d5e486ef9afb35b1ac1a6ec4",
+                        "s" : "0x28f9f704ae7bb2aed66e7d01c979394b9b9acbba7917492df32cb47aff75b305",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1465g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1465g0v0Filler.json
new file mode 100644
index 000000000..9b3978114
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1465g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1465g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105b9606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x88d1c48dc81a8b05057d215f36f3b5a8b9cc43a44cdc98d07f5227e2a17208f3",
+                        "s" : "0x2620d190936821ca08bbc8ba5b2e98a6156cd298d62d10560c872d0d37462241",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1466g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1466g0v0Filler.json
new file mode 100644
index 000000000..19f87c704
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1466g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1466g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ba606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbf781ec6aaaecc521308ec9d4343e23808bb65115b316c35aa7ce7f69491fd47",
+                        "s" : "0x3f55951a56a8a62fe2329dbcb0e7958cd7873d2466fa2fc74510dd2b2b5d3781",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1467g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1467g0v0Filler.json
new file mode 100644
index 000000000..9b83c80fa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1467g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1467g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105bb606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa2d6c6eecc521ea0f91667dc5ae35f2e91b752606d169b9fe4adf21076fa63f7",
+                        "s" : "0x5318952c2240f21a2e47785afa7536c4a69bed4ad529f96fade795928692fb73",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1468g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1468g0v0Filler.json
new file mode 100644
index 000000000..ebad175ae
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1468g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1468g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105bc606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf7ae17d5373931b24c776a83194f4220ad41c7b9b1d45f9aceee3fdbcef1ee2a",
+                        "s" : "0x45f593109193b775db031f2596d82193a61b4ba1c58e790011e880c666a17bad",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1469g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1469g0v0Filler.json
new file mode 100644
index 000000000..2a95ed503
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1469g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1469g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105bd606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8b42d57b61dcfacf65ea17d54a5f7c004930335c4d5fa4dc9e5b44aa7fa46c63",
+                        "s" : "0x6d030cce815da6840994d8ffc400675eb65606056e99046b5383f002cc004a5b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d146g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d146g0v0Filler.json
new file mode 100644
index 000000000..4e17876d2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d146g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d146g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60926064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xad100710602aed840f164298f6f73cfd3d067bf305989e42699a599c471edda9",
+                        "s" : "0x72643e2ce7fb5d826ef118f4d498a66fba582f4cb9a0d10989adb8be68199fdf",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1470g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1470g0v0Filler.json
new file mode 100644
index 000000000..3063a423f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1470g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1470g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105be606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6a21e068435d9a1b15587ad0849cf0f2fcc2a5f9648b9b8c1d1ae1936517fa04",
+                        "s" : "0x12075425e94965ea373b0a33e651440e0d70913f4f0a2954ae9c90e53fa984e1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1471g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1471g0v0Filler.json
new file mode 100644
index 000000000..da6fbe832
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1471g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1471g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105bf606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x683fb6d1e48e7db34ac8db4e5f8e2e98adea4ec2d33398022ae4319b32ffe65e",
+                        "s" : "0x1e75e5e6b913e2c92812168e2f8b5eb8b5b4a18097f1045fa2a58dc2da03c299",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1472g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1472g0v0Filler.json
new file mode 100644
index 000000000..f53b66e80
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1472g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1472g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105c0606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9c7ca2a395e87e0838201b46e9dbf40f7bc51521827dc6f1e2b3da5b27d9e6fe",
+                        "s" : "0x2397e28ee9186c08d3f001be9a5485a0863e3e9dfaa8eabb94bbdff7469e422d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1473g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1473g0v0Filler.json
new file mode 100644
index 000000000..755a18961
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1473g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1473g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105c1606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xee81210f469c341d00942675e1e5ac8996aa123135d13b612520b14cdf64f609",
+                        "s" : "0x1d9bc7193778dbc864f275f4ccbe08dd703762408a52ea730cce42ce3f147bad",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1474g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1474g0v0Filler.json
new file mode 100644
index 000000000..4a61715a1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1474g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1474g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105c2606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x08de38ea08dac2d309cfef57ae3d0df93e5d7ff07c171e83ee803ad460570c81",
+                        "s" : "0x16835986b9d8009a89d7ae4e7869ed07a46b1646d1339d333dcc8679938c109f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1475g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1475g0v0Filler.json
new file mode 100644
index 000000000..0fa4f3838
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1475g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1475g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105c3606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xac2a02442beafaa68263dbca2561aea428c54224e26721f6e1c25f39ecc0a761",
+                        "s" : "0x548b61cc4249aceda40ffce73c07f87f3acfacc2ae1d3381026f428318a6ba0f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1476g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1476g0v0Filler.json
new file mode 100644
index 000000000..1860f2f5f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1476g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1476g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105c4606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2d80285ff309c6bc1330c41c02438baac7d5e26311c2f148424ac6e5e0d477ed",
+                        "s" : "0x01786d7c6a5cc231d1b1b70c45b1dbf9f8ed368067fab9ddc8c2ff6afc368c88",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1477g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1477g0v0Filler.json
new file mode 100644
index 000000000..9d711a7aa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1477g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1477g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105c5606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5029765f685272bf5de29ce043bf830d27bb9176269efe4d6a186a76c65a6e02",
+                        "s" : "0x3e1debac591e1532cb837bc61b982f280ee88fdd49488b4fa810721c2763e600",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1478g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1478g0v0Filler.json
new file mode 100644
index 000000000..90484b22e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1478g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1478g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105c6606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6d2110aa1921324f8ada02f9805b935715241c5793c71d6c6915423a278402ff",
+                        "s" : "0x4eb04996097921064c7e2d82730d61974bb8fc02313182266689d83dcc48833b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1479g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1479g0v0Filler.json
new file mode 100644
index 000000000..2d6f52a7d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1479g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1479g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105c7606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0afee0e0c66fd1ce305fc3101db100cbe02139ceb23ba40b35fedfe62c959331",
+                        "s" : "0x6d53d09664b15f17ccc9880723433f16f2cd8b2bc6cc1236b351e37b35814f06",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d147g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d147g0v0Filler.json
new file mode 100644
index 000000000..9aa8c9f7a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d147g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d147g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60936064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x60c70c17b5b9c5d381d38fd6a747b6f86c06050eaa13089972576e69ae8b39b6",
+                        "s" : "0x175cb49753c39b5f38cf9a8944b56a8b53bf12e2f9fddbed69927f517adcb492",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1480g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1480g0v0Filler.json
new file mode 100644
index 000000000..8d53b0105
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1480g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1480g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105c8606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x53711f1f3c246d5372229d7ae0f95dc2bfbb784d255ad8f690de961bbfd97504",
+                        "s" : "0x229264d885267b9530bcfe8eeed883ef7719cb6512d7db39c26d40af965352a4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1481g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1481g0v0Filler.json
new file mode 100644
index 000000000..6c08cf5bd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1481g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1481g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105c9606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x58aa75edfe6abcca5728065002ee03012807341d9f4a8bedba89a7abd695feb4",
+                        "s" : "0x2d77bfa18f915b75b9d2c969306db6fc97e7a7acb41a347fe5b363c2632e922e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1482g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1482g0v0Filler.json
new file mode 100644
index 000000000..500199a61
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1482g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1482g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ca606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdf53a5a6b3ce7fd18e59f0066a60d1a8820e234d0748b9beba606c481d95bf88",
+                        "s" : "0x53b2319c00dcf94defd355ce39546b3d60cd19cc9d19ad996c323d876c3dc370",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1483g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1483g0v0Filler.json
new file mode 100644
index 000000000..b8f384a97
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1483g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1483g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105cb606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0cf042f392eb8f7d325059c8b582428deb561b6484eec55b0219a701d3cd06d7",
+                        "s" : "0x42f116a84cfe65cb8558f861a55af19d0243aec396cd72a208b7cc8ff6d99458",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1484g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1484g0v0Filler.json
new file mode 100644
index 000000000..76a5b0220
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1484g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1484g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105cc606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x099e17892a5e908a020547f85e4747b3751977733b2ae6549aa4ecbfde9eb9b5",
+                        "s" : "0x6e9516418904625534133e6d24077f759a5fad3d285d24f6e23fc92e66e94fe6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1485g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1485g0v0Filler.json
new file mode 100644
index 000000000..cfbb137e7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1485g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1485g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105cd606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0d6e4410ec0496e6e5657757b97aef759008fe3a16ebc9f6406d5f5a508c08a7",
+                        "s" : "0x71a7095afb2f0bb2d52e2b6306a23963440870be40fd71e03143f5e538c15872",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1486g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1486g0v0Filler.json
new file mode 100644
index 000000000..75ae396c8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1486g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1486g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ce606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xde8f4e8e0170ccb97533bedd17cea15942a18e28698be91fd4f848df48e9d420",
+                        "s" : "0x048a77481cb96be2da0e33fb04b1f846b5afdf357c0018eb44748616f1c63293",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1487g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1487g0v0Filler.json
new file mode 100644
index 000000000..745a61496
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1487g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1487g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105cf606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x68f5d84a16710aa67ef152299b5754b4504d7af1e642a51e9d6c649bc092421e",
+                        "s" : "0x79b25e56ca868dd4bd47a4e1487ebfb6fe326e0745b21665bdf135623f1627b6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1488g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1488g0v0Filler.json
new file mode 100644
index 000000000..6dfb5a478
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1488g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1488g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105d0606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x444803248490af5c8339b7e314bfa0b8333513f5ed277a6f0a5d1ba7c25e730e",
+                        "s" : "0x6a90c69363affe5609d2a270db8f8472d1f1c41e72b140ab0fbac3597f1d315c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1489g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1489g0v0Filler.json
new file mode 100644
index 000000000..e8753c741
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1489g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1489g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105d1606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfd10b51c5adadc9829cb8c40b8fb6fcd1f82227815578f732dfabc44f0f949c4",
+                        "s" : "0x40fb014d4f5e3e8982c848c426d006d4fd1c971122c5eaa0550af5daf0adbfff",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d148g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d148g0v0Filler.json
new file mode 100644
index 000000000..bb6144f65
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d148g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d148g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60946064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x031c65b11107a4f06559d7f4ee66563419aea1a3c1a6b1048c42b8a5d5b43149",
+                        "s" : "0x36d91a765ab2187bf0ff93860c7b39f2ba297c42660dd493072788f1c7dcef2a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1490g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1490g0v0Filler.json
new file mode 100644
index 000000000..8763e09b3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1490g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1490g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105d2606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaea9b1199bd26022150a438489bd59b0286eca56e22c0a686e75f2ad41279be9",
+                        "s" : "0x607bb245fdbf050987231765d644af9e3a8638fda56e8047e7cdbf191f987fe5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1491g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1491g0v0Filler.json
new file mode 100644
index 000000000..b5e0ef718
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1491g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1491g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105d3606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa7de1538a5c076528b3f4349c9879e8d9717e426762912f40b12fc9e6a6dccee",
+                        "s" : "0x599903aedc65da3423c1be56e1a5ba8f67df0f2b655bd9233e70f0e05b04c677",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1492g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1492g0v0Filler.json
new file mode 100644
index 000000000..e5c33d2cc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1492g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1492g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105d4606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x024a8d366971ab4475b79b133319dde7733766f21769406476b3a0ea8d4c0710",
+                        "s" : "0x52e72063e551559acb05dbf12ae39b24131b0a69a07917393a2c08c0ca0883be",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1493g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1493g0v0Filler.json
new file mode 100644
index 000000000..f75e77455
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1493g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1493g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105d5606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x85d31a5a8164cb25cba8f35768070e2f18f07fdcbef9ba14a451ed62358e2182",
+                        "s" : "0x29b2dd5a6a111b1d123dc105db2ef58b4e060b112dd5581ea791852d7224d2b5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1494g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1494g0v0Filler.json
new file mode 100644
index 000000000..2b2f6048d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1494g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1494g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105d6606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9d8c8e9659ce126fe6b17312681c7227e5e8a7a4b3e009bf0485b98e442539e3",
+                        "s" : "0x585cdedfe66df346343812d9502becd15b2e5674719182742716b108127558da",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1495g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1495g0v0Filler.json
new file mode 100644
index 000000000..473fce0b5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1495g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1495g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105d7606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x99db8dd84349ad595b913434d901453dace8ffbd945497e12ab07c94de708ecc",
+                        "s" : "0x1ec992fe2eedda9552ddb2b99b8993143ae9739b88ce9ad2658aabd1f73fe3ff",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1496g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1496g0v0Filler.json
new file mode 100644
index 000000000..44ca9d25d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1496g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1496g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105d8606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x68fc401c2755a5110c625ddfc79c241a87cabe91eab42d1f50284bae097eb34c",
+                        "s" : "0x7057f747d66434cd4350a5f771721e415ada6aab01b9587f7929c71fc0315458",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1497g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1497g0v0Filler.json
new file mode 100644
index 000000000..63d7226c2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1497g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1497g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105d9606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd36cbfb515729619d19b47ff96adbcc85d6bfabfc07f72ccdad76ae6db6a297e",
+                        "s" : "0x49a0b97fbaeec8e1848ffd5f20bf00bb4be9446c4646107888d25ecf319bf6ea",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1498g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1498g0v0Filler.json
new file mode 100644
index 000000000..d2591e73e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1498g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1498g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105da606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdcae8a937003a178ccbaa03d3252ab9608d1d27f39b2c465840bdf20d88c6003",
+                        "s" : "0x7691ff3102d9b191177c1566aee50673d302cf7d8f0433b534b92b40aaf2a32f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1499g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1499g0v0Filler.json
new file mode 100644
index 000000000..ff33d35c1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1499g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1499g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105db606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xac16c58335277f96c9fe6ab7b9e53906ed9f6677dbc24ae70be5362214839733",
+                        "s" : "0x3446cf760c2d2db7f8f9eff89b697fe122aee55a95d50e16a57567d1d50a9673",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d149g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d149g0v0Filler.json
new file mode 100644
index 000000000..eaf227739
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d149g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d149g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60956064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82546c8f86c270c427477680012d7bdfa11ab7b4cf51572fb27a7834185eb8ca",
+                        "s" : "0x06490cec24d510b0e3f3b1e443d9c8ffc83d65b12476591ed9e0c2bca37054da",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d14g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d14g0v0Filler.json
new file mode 100644
index 000000000..a2fe024ac
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d14g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d14g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x600e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5446333694bd4c1d676fb62446e2166aba6630f17c183106ac5b9a64cf0f7af6",
+                        "s" : "0x7f963c7868cb83f18ebd72e49b28fd07e1cf9aa3bbd36f8ffb08cec7d791f978",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1500g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1500g0v0Filler.json
new file mode 100644
index 000000000..de6023ae5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1500g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1500g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105dc606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1d9607aef25e00a13a63fd1ea19df98e6d7e216e390120ce79107e243ac54665",
+                        "s" : "0x1e0e2b59a0f842b8ccbdf21c0c4752264561abc362ae53964a0e7213182aebbb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1501g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1501g0v0Filler.json
new file mode 100644
index 000000000..818aa2598
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1501g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1501g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105dd606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x876ea1c3c51cb2c0d96c7b23d45dae0f6dafcc1bac2c5d9eb1347082beb4f21b",
+                        "s" : "0x66f737a36769195ad02db685f2b867e32e04e764c2421ddea88f90966db453cf",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1502g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1502g0v0Filler.json
new file mode 100644
index 000000000..0f4d5b90a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1502g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1502g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105de606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc07b1272c78f39f0525f9118323a3960b6a1711da92f35edef3d34780e3ebdb9",
+                        "s" : "0x76af30661a999611aa3d93e2b50f0e1e6616e1b3410d952a11cf161c1d1856cf",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1503g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1503g0v0Filler.json
new file mode 100644
index 000000000..78f626870
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1503g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1503g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105df606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x28a5558d78ba68507e7fab75b45822bbdf7371d5d03a1e0adf2c99a8b1665f7b",
+                        "s" : "0x225c3bff0404a5fd13a8004f5c1bdd0c306b2b4b96c6b37ca6f369c032312077",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1504g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1504g0v0Filler.json
new file mode 100644
index 000000000..2d5a38890
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1504g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1504g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105e0606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0c85f3e3ab30dd777526b72f679606ad51a5cb15bc145117663ce3a8af47597a",
+                        "s" : "0x512369e37fb99dd44364481a35308b7904beea594066823aa9ab858a7b7b654e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1505g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1505g0v0Filler.json
new file mode 100644
index 000000000..353767ccc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1505g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1505g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105e1606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd1ecdc8b4035eb7dec048969af895f9b0789cd545c79c61a38c22c14241ac2b3",
+                        "s" : "0x302ad514ec96f5753bffce7ef05cc4aa12940266c1420f9e2b134f3d40ae7333",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1506g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1506g0v0Filler.json
new file mode 100644
index 000000000..e2a37886f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1506g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1506g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105e2606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5184cc7faef1e13888352f4c5dbc05a4906a2988af0136dcea913872f646b174",
+                        "s" : "0x65aa30aac327ab916bb61ac4360d431a20e22620c806bb6dcf99122c773dfac2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1507g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1507g0v0Filler.json
new file mode 100644
index 000000000..31edef559
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1507g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1507g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105e3606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb3c8f1dcd1c75b264698c1c040db14a1a3f664d9390a3c932bc444f077fc9c6b",
+                        "s" : "0x570f5b4128b00c1de2ea48f5e7265270c5f542f758eb03a789d90e811ef2134e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1508g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1508g0v0Filler.json
new file mode 100644
index 000000000..b593e3183
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1508g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1508g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105e4606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeb9b67375f7746f4250d31ddb7a454ce20b74b077b3deccd07b325d32eb481dc",
+                        "s" : "0x31fd3c87f45168fb6803c09d47c1a0ef109f7ac434864c49419e36eb2a0268c4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1509g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1509g0v0Filler.json
new file mode 100644
index 000000000..10418533c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1509g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1509g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105e5606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4ffde2433aef7b404185370d7c203d364ef26b7507ef6f7c8cdb126f092ff109",
+                        "s" : "0x2263889c7e967a37abdf25ec5b375a9ba3aeb6dd3d1237ccca78d6bd0b840a6e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d150g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d150g0v0Filler.json
new file mode 100644
index 000000000..75f7b7dbc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d150g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d150g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60966064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcb04ba8ef6f8cecaf7236772d227f9c74213d3c7567b1b08c8cbe6e703ee0562",
+                        "s" : "0x42f4c93c05dcc25854e2130257cfb27da62bc8da79d1299b155a10590826ceed",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1510g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1510g0v0Filler.json
new file mode 100644
index 000000000..0a6d2ad15
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1510g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1510g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105e6606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2ccd88053dc068047333df628f18d285209ccd02d72b40c1a5837ff14d1ebd43",
+                        "s" : "0x2ce0a20dd0ba0dde2c1db308929508c5f8e6c95d55432165f3b86fff0d846fb1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1511g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1511g0v0Filler.json
new file mode 100644
index 000000000..c531a0eeb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1511g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1511g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105e7606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa2cf9bc17284a2e6adc0b381e65efeba427e5787cf2257175f70d0f34dd22157",
+                        "s" : "0x3e4bdd14a2aed52a4076b120a515d1a736a7f7109a205d44771d4b182eda3775",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1512g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1512g0v0Filler.json
new file mode 100644
index 000000000..831e1a50e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1512g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1512g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105e8606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1fb0b74a961c6e119a054f82bea767cbcb625a6a585725494bd29f796a8bc652",
+                        "s" : "0x46813d5d17a1849c4c24fed102a5c0b4c57e86bdbc5f65596a01475cd83f9f2e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1513g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1513g0v0Filler.json
new file mode 100644
index 000000000..95939776b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1513g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1513g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105e9606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb1f8d72adaf07c5c1ffc339d09547af0fbfd55632a569a2a9f17c03b33e0df56",
+                        "s" : "0x333b57f9d67530f5ac484740f8b8b1335f9c200c1262297daa0c9bd9651805e5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1514g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1514g0v0Filler.json
new file mode 100644
index 000000000..3fa1e0f57
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1514g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1514g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ea606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbdc36f93fe13ac6ed2a87a471ce5a9e8fc50722eb8a548df64cea4b968faf775",
+                        "s" : "0x3cc834a8a610eb12331ccaa446d86a37599fa62c0f95edfb344f0d6423bf2a88",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1515g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1515g0v0Filler.json
new file mode 100644
index 000000000..4e08f4b4a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1515g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1515g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105eb606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x18fed1f1c82094f69ba26d2966d45489054e09011637e81223cf84b5a1c50e1b",
+                        "s" : "0x07ec61a26c0429fd4d245b24db88de9ec980dbb15a99ff2cede6c8d716a91c75",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1516g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1516g0v0Filler.json
new file mode 100644
index 000000000..516be5222
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1516g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1516g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ec606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcfa87b723901d53883855e9fa059c31e0ae28395c4f5c9ecab8608b2f0e649f0",
+                        "s" : "0x5fbff2fd67cb7c3449ec22562d70b8ca1e7629d0af211a2739ee5246450a0385",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1517g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1517g0v0Filler.json
new file mode 100644
index 000000000..fe1c5d71b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1517g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1517g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ed606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7fd24a0e2f729c7a889da6d528bd1c1e3856e53c52aa39f701a9740e5a7aa717",
+                        "s" : "0x5dda487a7c0b967ee57d86d0c9440063871c68b0107f80ead190341b4c9915fe",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1518g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1518g0v0Filler.json
new file mode 100644
index 000000000..0a220cce3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1518g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1518g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ee606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1390a5d179e657e18541f7697f1573792d39676252dedf2f7eca0692a33233f3",
+                        "s" : "0x1b71d91ab1e58c35eb1630b558c21e514469a8382f2f7f7b0b4417b4d09e7598",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1519g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1519g0v0Filler.json
new file mode 100644
index 000000000..7e9c6470c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1519g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1519g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ef606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8b99519080d68505fafb87c5f8dafcbf40455262e099212a42dbccd2bc9aadb4",
+                        "s" : "0x1e602e867b7696e15247765d3127c3dcf2e4bd0a2e1a7fa246e3e2c13aa4f84b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d151g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d151g0v0Filler.json
new file mode 100644
index 000000000..5e54fafee
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d151g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d151g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60976064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfb105178f7092fac471664b71a7a22e9dc991521d4a22b8b707948e1e708e039",
+                        "s" : "0x08be8c722b463a3f62437e717e8fabd02ba06800763ca4d06c9096ce5ce4535e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1520g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1520g0v0Filler.json
new file mode 100644
index 000000000..e94030a9e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1520g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1520g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105f0606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9a370a493df8ab3bebbb0570d7019b4fdd3d5cc748e3d98636395ada8f8cca80",
+                        "s" : "0x1ee0c6e94c2810b112e987e21038275096813f8fd6aef9f9c87a49147b0790b2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1521g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1521g0v0Filler.json
new file mode 100644
index 000000000..d65afe5e8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1521g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1521g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105f1606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x72805926ffea5eea866da5e247019a2f3eda17c799bca98d50d4982c16f5acf1",
+                        "s" : "0x011799607814df2c9e0a5ab3acf71a7e5ed5493402101036af5e7f03aff8ec1f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1522g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1522g0v0Filler.json
new file mode 100644
index 000000000..d565cb3d8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1522g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1522g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105f2606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfb7be9fd5cfb6220d1e307f3300ae5ca305d7464fa41041a0a9081ce4fbf81b1",
+                        "s" : "0x6569ae4f2fc40692cd3da39255130d5e1490671cee37e78b06fe288d68049857",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1523g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1523g0v0Filler.json
new file mode 100644
index 000000000..e1c4436ee
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1523g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1523g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105f3606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5656ac4e5a31b097f48404c01b16c94b080ab09290fafe9e506bab711a7fa20f",
+                        "s" : "0x7778bac5fd063c5be049f14010597b3576902b4f1610f5ffcc549855655cb21a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1524g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1524g0v0Filler.json
new file mode 100644
index 000000000..0d3a8059e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1524g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1524g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105f4606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x15833b2e9d503ad57c32edcc082c8f80f01f0ef0988b3b69b387f6871d825c4f",
+                        "s" : "0x69258dcbf7054baa024987f661b5db32173eb8ef5b283f0577f35285b3e5588c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1525g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1525g0v0Filler.json
new file mode 100644
index 000000000..a566ed3bc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1525g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1525g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105f5606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcbf401e756231bce104797e7edc8688c3ea71a52bc7c71364cb1bbbd53113e99",
+                        "s" : "0x47e11db3c78221efe720a99ea744c7eab8c40e77f03d31e3827bc140bbcfe32b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1526g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1526g0v0Filler.json
new file mode 100644
index 000000000..7acd1667e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1526g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1526g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105f6606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0b36696fd25a544c73282f96563506212f445cf8a53be4534e16dc8a7916ce6c",
+                        "s" : "0x4276221816dea92ebfbce7198d4bef4a7fd11972a517fbb4d512f5d6fd3153f2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1527g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1527g0v0Filler.json
new file mode 100644
index 000000000..cf5f95d9f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1527g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1527g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105f7606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xea36c7960a3883ca00c14ef6d67ee75821e4caf01de42c6f56d1e1c67ca75c99",
+                        "s" : "0x3e03007a7d444fd53877140f1a01b4967c5484481da7a091727c9c1907b9caac",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1528g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1528g0v0Filler.json
new file mode 100644
index 000000000..066465b3d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1528g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1528g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105f8606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0bfd5bfbf344c824ba01c43b8c895ed4938a57af358bf0d6b64807d8eb8ee97a",
+                        "s" : "0x46ee74b64cbb0bbd610eb6ecfbd3168a1e172a418045e6cdc839c1de896ae638",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1529g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1529g0v0Filler.json
new file mode 100644
index 000000000..fb720e290
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1529g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1529g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105f9606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb6faaa7847da9b0d99fca17ab07beda716cbc16c6d647f1608e8ec35d73816b2",
+                        "s" : "0x7386cc7274496ff4fb728653040efa1e6115df4271f55abccf98123383984b25",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d152g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d152g0v0Filler.json
new file mode 100644
index 000000000..71ea0440c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d152g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d152g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60986064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfb35b5d07d76de905efb4bd8ef6c75230f350e2ce693d47390592497fe5c058f",
+                        "s" : "0x3692b3e5838096fc233b42b7298076d5b936a06027debb8a9c98416d69f7925b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1530g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1530g0v0Filler.json
new file mode 100644
index 000000000..a8ffbe2d4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1530g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1530g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105fa606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb646704c01e72bc4fb9ddc4ef32ee642af33ca4de77692483b6cf999a89c2354",
+                        "s" : "0x4665e9efe5b6ae731230e7a51de3e5111358546220a63e5b110a18d43951ba0d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1531g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1531g0v0Filler.json
new file mode 100644
index 000000000..ec2844263
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1531g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1531g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105fb606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3f2172b49d03654029d939dc1bf6a9d70db33efb4cb698f695a72b09c941e50f",
+                        "s" : "0x73b7d26ca2e2b3fe1c0ac8dadfbffa1ace63580edca451ababcfc9066e897684",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1532g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1532g0v0Filler.json
new file mode 100644
index 000000000..a9753147d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1532g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1532g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105fc606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc138b598d69a8af308ee0e297f3c3591405c86b7c9bdaa5f1ab8a85dcea40138",
+                        "s" : "0x7747e89d783bf0a88198884852622d49edfc4ebc1dd453a8963ea924721acaae",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1533g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1533g0v0Filler.json
new file mode 100644
index 000000000..c3248db9d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1533g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1533g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105fd606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5570e38175ef205275db51ca2c3f55b8174c841447865149860dd21570463834",
+                        "s" : "0x0e43de8315a1ec377ab8464983d30559d6a19dc7a2f72fa08f02a22d1c85eae3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1534g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1534g0v0Filler.json
new file mode 100644
index 000000000..f671502c1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1534g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1534g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105fe606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x909cb797e00eab8595389df96a373345f3eb5648914e8ee44fd686f07e7caad0",
+                        "s" : "0x3ece7699bf2eb4d456dc6427b7f0c2eeb1b5c9c43ef817121056bbb6a9b6066f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1535g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1535g0v0Filler.json
new file mode 100644
index 000000000..4b2f3e29d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1535g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1535g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ff606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5f8c9aac93a5a3cf5e08f9cc20324dbf833f56aa2312b97639765100ceefba71",
+                        "s" : "0x1a1ee6acc224de05a0ca74568482d1c7551de06b7f717b8ed8171c407d8064ce",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1536g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1536g0v0Filler.json
new file mode 100644
index 000000000..c1fbfb4ad
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1536g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1536g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610600606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x96817051c3bad7b35023f55db5157e83013746d98a0663558085430a385db1b9",
+                        "s" : "0x568f42d352340fb8443783be4cebade9ad5c3067563a7192c18648f9635c0290",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1537g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1537g0v0Filler.json
new file mode 100644
index 000000000..f680983dd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1537g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1537g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610601606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf5a9d7a8fc732828683bba3fc29990b17a7a68476ac549e7aa85cf4395b0de9f",
+                        "s" : "0x5a5899ff9d51159850f901b2dd6e8ed80f454d61c89eb4641af06975dadae1a5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1538g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1538g0v0Filler.json
new file mode 100644
index 000000000..2a27fb91f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1538g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1538g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610602606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc1df8d72e9d8812de7936b310c8dc0aea43cbe57dc792eed583829401b936992",
+                        "s" : "0x53ef63f13c3abbc90e2f8dd232d90fe9d7e71aa6cf833cba5d8afe010f731fd3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1539g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1539g0v0Filler.json
new file mode 100644
index 000000000..49504b9c2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1539g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1539g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610603606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4d0715fcc8594c164511ab844a2484dfcdda5159cb671470557b5a6c919d9194",
+                        "s" : "0x06867497a7720936d2d3e78f2917bfb93b3c07c62b020c60265bc4518c0680bb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d153g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d153g0v0Filler.json
new file mode 100644
index 000000000..45de938ad
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d153g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d153g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60996064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x524c676b879bf8449a5c417782da018302b0ebc3ef8011f8971198199cb18731",
+                        "s" : "0x6e98b147166890def9496ed7b0e2838947a0a378c5c9af7d1c174899a08a3101",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1540g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1540g0v0Filler.json
new file mode 100644
index 000000000..ab742a5bc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1540g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1540g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610604606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfad10c61b8e2cb962882bf10bb460e090b3bfa3cfcf3c7a58cd5b80ee6888558",
+                        "s" : "0x5c0ecb18fd59c17be1a2e8b13fc33cd286a63d2b44a675f26db6e94b9525140f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1541g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1541g0v0Filler.json
new file mode 100644
index 000000000..3539a9eea
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1541g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1541g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610605606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x121ac3fd043f080e84f98b051edb7e021e52f608f75388e9a68303865aa6ab23",
+                        "s" : "0x6b5041b464d692e60b06e44d4dc055034973cc8ab88559dcbf4c6cfee8410797",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1542g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1542g0v0Filler.json
new file mode 100644
index 000000000..3812ecf58
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1542g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1542g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610606606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb045bd364b8f5b686f67f3fd144da8cf25d8ba3beb6415f3c313682779e08e83",
+                        "s" : "0x68aaa3819af3e218b7860ee7d7883325f41ef8613083d0c91728a99dc0ab4abc",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1543g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1543g0v0Filler.json
new file mode 100644
index 000000000..09af8b662
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1543g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1543g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610607606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2041ed11e89fc7fdd60bda7fa8f62449344085a9fa7543c2a494d455be55eea9",
+                        "s" : "0x3a78f5666a4c8a8aaeeff877758655b17e14bc5658e7319541a87d2cae24c3a8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1544g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1544g0v0Filler.json
new file mode 100644
index 000000000..7d618216d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1544g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1544g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610608606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xba6f6e421268c7c331a43e95d98d3ea3479a29c06763b787c9ea85d72f491590",
+                        "s" : "0x5743a8bd175b558e8edc8950f2f2f51c13aef3ed1d1de391f1398d9dcfe42704",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1545g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1545g0v0Filler.json
new file mode 100644
index 000000000..d34f2ca12
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1545g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1545g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610609606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x96993d75773659adb44335e0f8df4c0c57ed7a9f72d5cc6b28084a846bfee3ae",
+                        "s" : "0x662dd15956a9690990c71e1d74ec66e3bccf6825570cda713c8e9dcde6548bc5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1546g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1546g0v0Filler.json
new file mode 100644
index 000000000..1e55e88eb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1546g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1546g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61060a606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeb1710f7b259b8099784028d879322d18d0bca9a618e7981878e0e94ee72d8b3",
+                        "s" : "0x199ef6d9a0d6c8142b73970d6e375387f3e69957963d5ab817ca19ec60a61e2b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1547g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1547g0v0Filler.json
new file mode 100644
index 000000000..82da9d22b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1547g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1547g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61060b606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa2da797afd2e7f7ec8eb16ac73295c690f90c2cd468745386fdced8c952dbd44",
+                        "s" : "0x565b93b3136c2fccae2cb6fad3c4ad338afa681a885724121b311c19878e5978",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1548g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1548g0v0Filler.json
new file mode 100644
index 000000000..892505dcd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1548g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1548g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61060c606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xce3d9b0ee4629da3ea49e375cbab98a44c0a7f576ee793815cf3cafc63e38a6a",
+                        "s" : "0x091a7b01e74b49e972f704a7795d9a1ef7cfa4af82cbc5620b26367f9f2180e3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1549g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1549g0v0Filler.json
new file mode 100644
index 000000000..3a4101762
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1549g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1549g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61060d606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1b381f76a6d1564ebe9adff95e814fbd77d0638af66c6e63dcde3e192e7f04b9",
+                        "s" : "0x7f4bb41dfe72e2d43aa90260652e24e81b4b945d03069a02288700cf671d1aa8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d154g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d154g0v0Filler.json
new file mode 100644
index 000000000..56560c842
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d154g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d154g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x609a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4c071a9bf2239246f3b153396341d6e40706e140dfb8eb8e74c9df435fb36f52",
+                        "s" : "0x2e9d8f0f287b7c63bdd824b365cb92b393ed4b903e5b527fb066f685d4b43303",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1550g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1550g0v0Filler.json
new file mode 100644
index 000000000..1e5c99dc7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1550g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1550g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61060e606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x293d45324e857978950e85671e1147c18099c36de6e8fa016122c320cbc3a4c1",
+                        "s" : "0x384911711c951df08b5d34e4bf00abc0dad167aa9a04cc600c8748972ca12040",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1551g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1551g0v0Filler.json
new file mode 100644
index 000000000..dd7e259a5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1551g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1551g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61060f606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3878b553ab7e09c5b939c4aac98b4302e8c4a35cf46d21a033aa23b2f837c5a4",
+                        "s" : "0x12102ad74a759538b181cbb6b941471b85bc348006acd350ae07ef9c8e8d588d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1552g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1552g0v0Filler.json
new file mode 100644
index 000000000..6e3237f11
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1552g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1552g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610610606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5f1fc53fe2d42c5482258f12f3e26701bb2888ba22df4860000728ffcc4d44e4",
+                        "s" : "0x26d0ffe1494baf3ff1c290f710616264b2ec6ad0ded642e5cbe0cabbb71d2f3f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1553g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1553g0v0Filler.json
new file mode 100644
index 000000000..e1e174b49
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1553g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1553g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610611606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6880bfa65e365bb285683207c495f9eb025a704518aea65ef1f44e6ce64f67f0",
+                        "s" : "0x6d8a1ba75d88038059deb765a2520d6662defb893e76f47b47d47cc51c5d2e08",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1554g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1554g0v0Filler.json
new file mode 100644
index 000000000..481e5a880
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1554g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1554g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610612606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5c818529d5521dd8c1304ac1f5e6693edea5024059879ea94f2461bbfe530202",
+                        "s" : "0x6696123c15b999820f085a2c51d67c20c3304ee7c979a36aed43fbf930f284d6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1555g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1555g0v0Filler.json
new file mode 100644
index 000000000..983e30058
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1555g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1555g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610613606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb636e19f4d43c10758fa22a9921f289a94a27561d801846b89d8afe335a9ffbb",
+                        "s" : "0x4237017de77154eb5c26edc81cd939f9791a97b50cb4fe25e3523be445ac6bb7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1556g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1556g0v0Filler.json
new file mode 100644
index 000000000..344df44d3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1556g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1556g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610614606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6ce42ec7a2e427ab3ea7167916597656a5ff1a19a1c1421ffb6fa89108810ad9",
+                        "s" : "0x3aed22677e8974d4b50ed86fcfc9ab60cc9473bb94e06e8e177d9f4ed6780bad",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1557g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1557g0v0Filler.json
new file mode 100644
index 000000000..01b54af02
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1557g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1557g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610615606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2ff954b69fe9b311a9821f3f32c6ebe7750df78d827b194dd17ea206a3c3ec8f",
+                        "s" : "0x7f51e723891d4afb45bdf711ba2af5b850746df70893fb554bf13e52ded87e04",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1558g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1558g0v0Filler.json
new file mode 100644
index 000000000..b2e6de120
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1558g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1558g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610616606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa84015f4d0887914941eda65f446bb1ce886acedfeaeb5b52b84494bf08e9914",
+                        "s" : "0x45e47e966be7d3832501cb605b7d4f4c8fce761957eff0cbdc35208fce828445",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1559g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1559g0v0Filler.json
new file mode 100644
index 000000000..50344774c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1559g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1559g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610617606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5510f5e4125f80ffb3c083c6d4a8a58c31a611d3565274d51ede62610b692aef",
+                        "s" : "0x4316c8b6b04382292f80f06203388c11b5b4a0cd4fe316e2a8f23424576f02ad",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d155g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d155g0v0Filler.json
new file mode 100644
index 000000000..3f718136a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d155g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d155g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x609b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x55dc189fa6e0b8dce338c89693d26ac3854be2b21e466b62df1e7510671feada",
+                        "s" : "0x5919aefbbc2ea28140c3fc129551412b2b1ab1dab74c8587df70878daa1697c5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1560g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1560g0v0Filler.json
new file mode 100644
index 000000000..0f51add9c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1560g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1560g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610618606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf5fc98e3ceb3986de11de6febbb012dfb44f85999908e2822513d69f17f91566",
+                        "s" : "0x442a97156edf04e9ce9f3007ea703f7491005d419c7f35c5f36f019a597079d8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1561g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1561g0v0Filler.json
new file mode 100644
index 000000000..1a5861a9f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1561g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1561g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610619606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x89d1191d30faf187c528f42439926961398bf8e066ba72849bb0a16bb665f1d9",
+                        "s" : "0x021576497a868e324971a5e113f2a3335df9aaa7a4a445992040fe8d14a203c5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1562g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1562g0v0Filler.json
new file mode 100644
index 000000000..73b4deaff
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1562g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1562g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61061a606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xca2afafc0329d2719ff01d7350ad5a537fbded3eabe12ca1ef9f96587406a700",
+                        "s" : "0x26fb3eb362ec7bce597318d0398e21b2c67c12434af192b5a36a20f838d26ade",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1563g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1563g0v0Filler.json
new file mode 100644
index 000000000..fcd7c6b91
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1563g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1563g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61061b606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x78658cb75c3afa1fe9a20d42ad2ac9b2b4c1eb54b287754c5bcb021762fbdc62",
+                        "s" : "0x3d9d8cdb741a9ed5ddfc9c1b064eb239b75e6dba473faa5c293823c658a6b84e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1564g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1564g0v0Filler.json
new file mode 100644
index 000000000..290f5dfb6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1564g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1564g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61061c606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x31e678bd8916dc2c2ae0a43837ff3f785ae1c79645d3e81b10be0db6b0d3d1c0",
+                        "s" : "0x6de5efba391422b7e826229b4739dbe46b48a2006eefa46584e94a65a98f3e6f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1565g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1565g0v0Filler.json
new file mode 100644
index 000000000..cfc3597c1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1565g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1565g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61061d606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd8ef0c5127713fb3da1ff1800e613babf0f85e760148dd208cb84463b245f837",
+                        "s" : "0x44d0dc8b1835ffd479329f20d9eb063f3d81d24b1f684faf0dcb6989c71e0485",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1566g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1566g0v0Filler.json
new file mode 100644
index 000000000..ef4ca071b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1566g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1566g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61061e606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x104065f910db1c61856d0d07e3d099a22281e5c5333acc092d6a42372a60327e",
+                        "s" : "0x5849e8133ce8a4372c86c1d218320277c8216305f387627764196af139917300",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1567g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1567g0v0Filler.json
new file mode 100644
index 000000000..731b26462
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1567g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1567g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61061f606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1803491b433e33c86ca9ba8689914fb76a82a9d7dc7c4f93f2fe8903ff2281fe",
+                        "s" : "0x0126d2520b0a34c63d117bdba82cfa76964953bf5337ff83bd489d5812f43610",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1568g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1568g0v0Filler.json
new file mode 100644
index 000000000..17a9a5ca8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1568g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1568g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610620606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc79f9ebb57b0592fa8d580f320e733e1617b8ced6a84f927eaef60cc56e3e47",
+                        "s" : "0x238cc0b282f81a279622a358e87a3a605811c8c62ed108b7efef79aa3946d2f1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1569g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1569g0v0Filler.json
new file mode 100644
index 000000000..4cbad88e0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1569g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1569g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610621606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x15a629bb1e3c68e42f80fee30d3e2f4808f8c74bbba53a22049d50cda3ec6ecc",
+                        "s" : "0x75c6cab5848a41d8bd649334d14f60fd0d31f718162250fa902b25afc5b14294",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d156g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d156g0v0Filler.json
new file mode 100644
index 000000000..6c271c04d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d156g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d156g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x609c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3d1c701b05268687e7efc83b25c972cd2eb000f7aa054fab736b38a1562cc9f0",
+                        "s" : "0x479d2853b7cf726fe107c8404938fb0b654eeaa4f8105a2b08aec6118c93d822",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1570g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1570g0v0Filler.json
new file mode 100644
index 000000000..d4045fe37
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1570g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1570g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610622606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x06580e74f1ce2693f47893a6d500096771c13e7a37d8ea73bb8a2da0b755b0ab",
+                        "s" : "0x2e295001f09255887dfa3b6ae199def17ba82773a5ed24b4e24e4a0ff043ae36",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1571g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1571g0v0Filler.json
new file mode 100644
index 000000000..451f223a3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1571g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1571g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610623606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7b9c5dce393a08c389b8c9138c0163a123f0c338ef0c1f856e6f927279a0e759",
+                        "s" : "0x356d2cacf76a0436bf8f1f79881338d5e4026d4113621470829893b0c0e86b3e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1572g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1572g0v0Filler.json
new file mode 100644
index 000000000..7247f2dbc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1572g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1572g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610624606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2ae83fb4894e5c4c84733359b9c283c816af08c107edd3741cd4d3eaf4a68e3e",
+                        "s" : "0x1aaaa94688c753bd03ed8a07c119c8d2aaf8b34ad2e913140f38c6908e3e1558",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1573g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1573g0v0Filler.json
new file mode 100644
index 000000000..acccdb108
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1573g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1573g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610625606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x56895de1c6349e997240cf41778bd661c73dd0c2d5d10f27a1e15140e4b2454d",
+                        "s" : "0x5c0d473aedd3b11eb1d274d7d8e0ab5af6094a46dc81b3b299fe30e18d9e8319",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1574g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1574g0v0Filler.json
new file mode 100644
index 000000000..3b6b67d34
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1574g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1574g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610626606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2a5c6b06dfa610ffcf4cb52ce544b07faf07d167765d916a7cffcea1dd6efb37",
+                        "s" : "0x417301b8bdbcd4538f490922e40598acc40d275a0ec2effba3f625c27270211a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1575g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1575g0v0Filler.json
new file mode 100644
index 000000000..4976bd9ea
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1575g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1575g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610627606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x871846909e75ddf57dd5b1a7a4bc4099ba687ae615aaee92c73e97fdd1bdee3b",
+                        "s" : "0x6df975f7783c1a65e531ec8b54633e6bd89bd027cd1074af10696b68bffa0222",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1576g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1576g0v0Filler.json
new file mode 100644
index 000000000..ee4bd8781
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1576g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1576g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610628606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6a25a6add7cd6a42d0a35975165abc2f0f1c88bedc3592442ffab7276b5ed9c5",
+                        "s" : "0x24e60657be82702db97b30c0e695769c70249b8aa414995849d6b9da647da187",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1577g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1577g0v0Filler.json
new file mode 100644
index 000000000..b59a59ba6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1577g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1577g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610629606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb044bc01cba750efa23c47df9421d29d38f418431fab580630a3784d038d5860",
+                        "s" : "0x1008cce30fbdee515807adf52661f2f9a3d10191f5b57571ba3ba0e5ea2e0cff",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1578g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1578g0v0Filler.json
new file mode 100644
index 000000000..0732de494
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1578g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1578g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61062a606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd45120c1715fd90c8f91ae6316511e5201cb6f230693d8e8b2a77d4bbc768525",
+                        "s" : "0x10c27591f982ab5efae8173497bef44584fdcfb6788cf49056aca01ac0f49645",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1579g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1579g0v0Filler.json
new file mode 100644
index 000000000..6a257b5ee
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1579g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1579g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61062b606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x08eb2c47f8aa2f2335509f7584e724c5beaa905c416f5c8372ef096853c29cf2",
+                        "s" : "0x1d14f82a8219ecaef9586d26ec2e3f2483dba6a6b06d675c880cfef7c89eeca0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d157g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d157g0v0Filler.json
new file mode 100644
index 000000000..59fbb8719
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d157g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d157g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x609d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4e22f92d6d63d7ac23eea605ae328020870fca1cfba6d837fa6cf86a6f79e2b9",
+                        "s" : "0x4dbbe399d859b84b76ec380f69bafd1f5112aef37405aac7107c2602065415ef",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1580g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1580g0v0Filler.json
new file mode 100644
index 000000000..686cdf273
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1580g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1580g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61062c606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x67deb505c5b56deaa1862ed59a273d7aaf7ca381b65ff79e14c6b01b58a3a484",
+                        "s" : "0x4a45136e11c1823372cb5ff7a6a1907dfc9c5be8e0d5fda9ea814ad386bb2108",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1581g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1581g0v0Filler.json
new file mode 100644
index 000000000..9cfb4ea23
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1581g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1581g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61062d606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xab029ea26375666de27e1cbd54a4856a683207ea1e6144554f8316c51c28264a",
+                        "s" : "0x46da1d7a7a814c3725777c5ab009dba5a56b17d05b52b818e8e0037c69d1db1b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1582g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1582g0v0Filler.json
new file mode 100644
index 000000000..60f94bbbc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1582g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1582g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61062e606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcb4af4bf6df10e9cdb263d9a03412333ef6c41e35d78f7562699346c7bae1e36",
+                        "s" : "0x1cff0eb5d12e4169410bded6e11272d248343fadaa1bbb650df163bdbe928cac",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1583g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1583g0v0Filler.json
new file mode 100644
index 000000000..e9c069f11
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1583g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1583g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61062f606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf4246b796253e1831609aaf6f6bc8a62346f11d2f634fed10838153040866400",
+                        "s" : "0x7d9f0f77db3dbd10eacd20827d68272dc3f0d8025edfdb73adbc32f622cb6d19",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1584g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1584g0v0Filler.json
new file mode 100644
index 000000000..674de5e71
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1584g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1584g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610630606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb32b3376c6401c498421633a7ff07ef0671bc46e6571f4e3ea4c41acfd54138d",
+                        "s" : "0x105aa19492073adfa018cc97f55002f17771bd239942d4f996da1435b24d9b74",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1585g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1585g0v0Filler.json
new file mode 100644
index 000000000..e8235f1e7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1585g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1585g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610631606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfcf19d6e8415be39c7222d7fc32c68685dcf68ac3c682152cd4a0ef95c1167fb",
+                        "s" : "0x4549e840e7b1a3f59122cb3be1fc0b29be6583ebde4a76b5f6755ad661bbe03a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1586g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1586g0v0Filler.json
new file mode 100644
index 000000000..f6d3bd2eb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1586g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1586g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610632606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xda5a06ed75145e4b7b6f611f95a97de6801a63341725858228f180e744e34619",
+                        "s" : "0x22aeb338b556113adf07bd634325478ccd12835d1470b83b5d57074e62ca4599",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1587g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1587g0v0Filler.json
new file mode 100644
index 000000000..0706d6dc4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1587g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1587g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610633606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe16fab854a50215bd0146dfc4fecc51fe3a64ba3e42f6918fc3c62cc3ca194f2",
+                        "s" : "0x7eafdceb39fc9d63061b6294e260ca8408df72e368b7d58e977fdf261d98c728",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1588g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1588g0v0Filler.json
new file mode 100644
index 000000000..43f18f730
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1588g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1588g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610634606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2d0b24b3ad2aea0aef1aa19b77faedd0d27018be0ee0f53d78b53567e8635067",
+                        "s" : "0x672bd9febcba681bd24b7571e6814daedf51bb3d21d94c08a8d1b7f96ad4a08c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1589g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1589g0v0Filler.json
new file mode 100644
index 000000000..adb120fe6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1589g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1589g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610635606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe6cc7ff90bef91fe5cfa9a024093060736c0486ec29d2ea9bdf387ce08768cf0",
+                        "s" : "0x39d8e8fdf07b2dcbf35c9d0c6c6fd6fbe663a7270bd009ab27f1ce36e6eec300",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d158g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d158g0v0Filler.json
new file mode 100644
index 000000000..3d05f8470
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d158g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d158g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x609e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x18122330c398da76f5a2b7fb664a00b6d73124e85ecbe9197cb6bd5d6b548466",
+                        "s" : "0x4206dad1ba2cf421b87dd2717c9ba6e50e100153f5f2504b7c1818a23abb29c2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1590g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1590g0v0Filler.json
new file mode 100644
index 000000000..aa6b594a2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1590g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1590g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610636606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x17f1751abb582d22286cab01907a6ddb9d7d30cc0861b789f55e075be139ea95",
+                        "s" : "0x3b904df4a34405d37c56be22539022b8520ba52a196ab47de5cb157f7c223ee1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1591g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1591g0v0Filler.json
new file mode 100644
index 000000000..ea8e1e930
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1591g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1591g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610637606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3a06bd2e7877a0f35d97f0e34bbea97f903fd9e146b75e7784694988ebb065ff",
+                        "s" : "0x581d2af48deae445dbc1f7fe8558a8f34518bf0d69d8d5e5c7da92119be9c951",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1592g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1592g0v0Filler.json
new file mode 100644
index 000000000..748c60e3b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1592g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1592g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610638606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7c619768c206d54fa33010a0170b12def23261e7e2f375c2b894ebc57c76a43a",
+                        "s" : "0x5414308ec156f6774acf23af96a62b4b60fca5622bcf9c5e476b76058a79e8b9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1593g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1593g0v0Filler.json
new file mode 100644
index 000000000..4eec07bb7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1593g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1593g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610639606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3b25e57924c82bec1de21f5ef76e494566373339a235080e7a7b6d4a7fceaf2f",
+                        "s" : "0x1e7a09981c8d5895f08b3e2905a60cec21854821bac9f9adf0ca3fb010744ca9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1594g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1594g0v0Filler.json
new file mode 100644
index 000000000..c5c160b62
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1594g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1594g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61063a606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x79cf24406d00df0737260c368b5ca226fa1c11d1c70101501d690784dfb7f571",
+                        "s" : "0x59761982743f6e0663f30341a2e8be169c23ce6e14773bbf31eeea616402829d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1595g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1595g0v0Filler.json
new file mode 100644
index 000000000..a971341f1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1595g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1595g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61063b606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x994a8c63d84a8e9d4dbb97f3dbd0adef52bd447cf3d74151662bf08fec734949",
+                        "s" : "0x64b6707b6156b4d6fe12b2f5cc15fe2685b6a70b2d65822fa2e4406833667311",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1596g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1596g0v0Filler.json
new file mode 100644
index 000000000..4a9fb846a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1596g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1596g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61063c606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe3cc55ba12897a29bb63d7fe19bf8fc43bd831e9bbe8f2f01499977fdc45c578",
+                        "s" : "0x6268b4399f469310569fb6418f88c249b33437a30eec6b90b2bae56707d6be86",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1597g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1597g0v0Filler.json
new file mode 100644
index 000000000..842061d30
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1597g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1597g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61063d606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf0ef605758bcd22f59a6f05695a2bece7e6e365ab4a5307d50d4cdec794c6717",
+                        "s" : "0x489ab72146377d687fb28cbe7ef3f009805787d994a1afcb8f89049da2cc1994",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1598g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1598g0v0Filler.json
new file mode 100644
index 000000000..e1813ce2a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1598g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1598g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61063e606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6a57c2b09d61c1acafb276afdd8bb7489f930cb4e858c37d25af62e3e72cdc4a",
+                        "s" : "0x765ef84207e9c91c6c9f1967d6fc74765d85f116ea79ad018eee03cfd6f13428",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1599g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1599g0v0Filler.json
new file mode 100644
index 000000000..34a49b693
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1599g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1599g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61063f606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7ee7a8ee2e8df01ab13f08a7dd13c33784db537c5e8eddc37af9934a47d1e1b8",
+                        "s" : "0x425d883be6429392159a621037f2f6ab11b7da30738517534ff6d5463eeb99a0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d159g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d159g0v0Filler.json
new file mode 100644
index 000000000..d2a30d7e6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d159g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d159g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x609f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7ca772da909b944f42a01d08b81942ca660b603847115d7643a80a096eb66b29",
+                        "s" : "0x632672964dae6647cb9b4912ed24e6b0877fd3bf0b7402edcdcfb7769f77fe99",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d15g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d15g0v0Filler.json
new file mode 100644
index 000000000..bac93723b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d15g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d15g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x600f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x697f80f86b62164df6c78c8a3b0b0bef917df0068d7ca452b9cc3ff780487ea2",
+                        "s" : "0x512a23df3381c3b92987d96eb4cf399ad72c55ceda89c05afdbb0c93db6cb92a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1600g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1600g0v0Filler.json
new file mode 100644
index 000000000..c24be5bf8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1600g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1600g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610640606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6456f906d0e13ace7870f60c612ca2410499e353ba05f568101d8b2a254c20d3",
+                        "s" : "0x022bf97c67234af98bc023085089a65050e3e5789575fbac9ee55195f768e3e8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1601g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1601g0v0Filler.json
new file mode 100644
index 000000000..6eab67c2d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1601g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1601g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610641606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd0a618513d891b492d409f78adc9d6fb0d5c0903d36c0b6b1edc9746a03785b4",
+                        "s" : "0x15ee57ef438f6ef6c95772e7fd66e29c6afe8ba9fea81862cb5b0adb09c4f7d5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1602g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1602g0v0Filler.json
new file mode 100644
index 000000000..10f708a6d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1602g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1602g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610642606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x726cf44a3b311a0988e3818cbe32734a23c23f022ed34fc77e0ec9338a5c29aa",
+                        "s" : "0x042b39bd26ed3a8028955d758d55e9e6f60374d125bcd3460a5a52265aea567b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1603g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1603g0v0Filler.json
new file mode 100644
index 000000000..a9ca1469c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1603g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1603g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610643606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xecd763e97cd6c6a354d73ad0063e439c928f02b093aa386ec7f37b90c6a6a3e0",
+                        "s" : "0x43e76a6050e147ccf5bab90e51acb64e562e9ea43315f07aec030765e55cb0a7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1604g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1604g0v0Filler.json
new file mode 100644
index 000000000..d0eafe268
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1604g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1604g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610644606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbec63e06b00ff87268099b29e18ce54960246c27b085d4ec1d074f85559f1697",
+                        "s" : "0x5421ef185b1631162810984fd1ba163b78645b577c31b508588f9ebaa06e8d37",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1605g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1605g0v0Filler.json
new file mode 100644
index 000000000..176aa1484
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1605g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1605g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610645606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf8295a9aa0c4b634095906f32dcc5a844151f88db2db4a56e543d40ab5a43d39",
+                        "s" : "0x24a6e2879cbd999db2a8144b04f395a2b3e09c67281cbcee6b078c89d47c1680",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1606g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1606g0v0Filler.json
new file mode 100644
index 000000000..f6a5d664c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1606g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1606g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610646606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4feac38ea02e503d8408c5ce31fab3037642f90731685352ec00bfc164fbbef3",
+                        "s" : "0x3d04b10656220daa3ea0f510ec76a35912ed9acee6b8119ecfa7323f8a1e20af",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1607g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1607g0v0Filler.json
new file mode 100644
index 000000000..38bf606e6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1607g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1607g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610647606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x661d0ca3b74002470c46d3c1ee841b8812ab59da13df7f89a600476c005cdccb",
+                        "s" : "0x7618db3108ea83f71c46b59704ce4eeb9523846e825f2ea00d4f72e12473e6d3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1608g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1608g0v0Filler.json
new file mode 100644
index 000000000..c8883c0d7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1608g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1608g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610648606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0d4cd61c567221b1e91f152cb20c94fe2d6155a1dd639ce1bdfd2f34b45582e0",
+                        "s" : "0x35adf53194f1ef77833517f4a72c926b6d285c55e8053010d1f84c16b3ad7a95",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1609g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1609g0v0Filler.json
new file mode 100644
index 000000000..0591d95ee
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1609g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1609g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610649606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfbd28740ddd4412d6b5741feaa23485a0b0c649431c4a73db334e7812fd3546f",
+                        "s" : "0x283ab0d6e1224bcbd0270095fe92eab367a813d37259bf7656337509ecf274da",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d160g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d160g0v0Filler.json
new file mode 100644
index 000000000..74c67df91
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d160g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d160g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60a06064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2b167b5784653797cf2747ea0bdc50777980ccfef2a002260e01673232611eae",
+                        "s" : "0x1575a50827fcfef020dd2a94b1b533118810ac1febc1d9f5eacb997c8368f8e7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1610g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1610g0v0Filler.json
new file mode 100644
index 000000000..def8e67a8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1610g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1610g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61064a606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc9a929af361815812cc487010be2b4acb7978d44d99591647795f0ce8699d9c1",
+                        "s" : "0x18639256106c23f29c522c7616a9c6575ed43567e803c457431980e6f64a2edf",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1611g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1611g0v0Filler.json
new file mode 100644
index 000000000..5cb0ac0e4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1611g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1611g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61064b606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb54f0b948738f6b14fd303d66de8ad4e9e81bd8f3f56191383232cbe736cf08e",
+                        "s" : "0x161713efb27160c6f188d00f5e2d87129491b5ee39f2d9a61fd7fdacd946b312",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1612g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1612g0v0Filler.json
new file mode 100644
index 000000000..6c489b170
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1612g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1612g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61064c606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x152dc8525dcc619da430bea1c622d1c3e8a75320d281753e5f82d7327b773cc4",
+                        "s" : "0x3bf7b99fd400da2f63cf2a2f64de1b4fdfdca5543ab03d61a1cfff1fdd3d2e08",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1613g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1613g0v0Filler.json
new file mode 100644
index 000000000..904afa8d8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1613g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1613g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61064d606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5f25a97a84635571a75ae2d1b2f7157a28d6153193e7326e9ed8d8bbc544c441",
+                        "s" : "0x05e7859200d6b2db20e747aca17afbd899290195cf15fc2eaca8f3a5ea79efaa",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1614g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1614g0v0Filler.json
new file mode 100644
index 000000000..c2e0f910b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1614g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1614g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61064e606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x72926b2c11004713c33e767057fd3b4e18fb8993814ac3424aced04ade972f20",
+                        "s" : "0x2b59bb3b0ed1a9174b441ee8390584dafb21d00cae470b18ebaa34f53e87f0e9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1615g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1615g0v0Filler.json
new file mode 100644
index 000000000..db73d6640
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1615g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1615g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61064f606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x70db49a4d8ac50462a677e433d9ff6c057a58d611c8d47e5b2f494545fcdcad4",
+                        "s" : "0x4538ea63bd11a8157ca7e2c530ffee377b58cb3e4f389d300eebcf61a3053801",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1616g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1616g0v0Filler.json
new file mode 100644
index 000000000..e558027d6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1616g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1616g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610650606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7ed6161d88b8337b1fd0d5941ca1201fa0860b24270eb9f7b0ffcd100fe340ed",
+                        "s" : "0x0390e5963f24788029cd0364656cb9e83f922da1e3449ebd431b63be438cb96c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1617g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1617g0v0Filler.json
new file mode 100644
index 000000000..3eb05174a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1617g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1617g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610651606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc04836fb45a1c0306235fd099e4e1c46655f500973cdd60c3e5e7c8ae0a83136",
+                        "s" : "0x030c3d807395025f676eec1e0a84e63b127e7c1d90f469403f1ecbbc41fc5acb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1618g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1618g0v0Filler.json
new file mode 100644
index 000000000..a4991aefe
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1618g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1618g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610652606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x585b63b57b3a470acaae6a842602828555b85596c2f85ec1a119f974a5b8e773",
+                        "s" : "0x22a681313e473d5794063b6852f8a3ae46c43fda7c0c1cb0e02aa9f8221afcb4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1619g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1619g0v0Filler.json
new file mode 100644
index 000000000..32bc3a731
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1619g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1619g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610653606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x43cc7d89c7e547a76b7bb152746f7597d053bd942dc2756a7f820d93c05a40ac",
+                        "s" : "0x51799e560f71a51719e219de61d5f368ce5b011490b060f596cbe378ded645d6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d161g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d161g0v0Filler.json
new file mode 100644
index 000000000..85e912486
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d161g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d161g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60a16064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3c0bd5cfafe119aeee1160f163574f8fe9a818e1448433427282927bdfb110aa",
+                        "s" : "0x12f74bfbafa25a4f99128332a6c036e58c7fe0ead34cc49f21e13da38be39a45",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1620g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1620g0v0Filler.json
new file mode 100644
index 000000000..c5f482fb4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1620g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1620g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610654606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1016cf37cef7a3bf6eace2f8db26dcb6e693f8391ce428ef7beccc82d8177618",
+                        "s" : "0x5d4f3bdc86e766c6b932e404f74f249e0320356303506db2b4b94000b05fd0ca",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1621g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1621g0v0Filler.json
new file mode 100644
index 000000000..071dce4cb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1621g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1621g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610655606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9b5e5e47ff85644d055c123c86f1d4e23b7e890ff54e56e0d6dc4cb0661bb053",
+                        "s" : "0x185f43fdd01c482d424e54e864d31c3dd3fe4d86e044237886f1463688a95ea9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1622g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1622g0v0Filler.json
new file mode 100644
index 000000000..11755293d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1622g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1622g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610656606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x34bc67cd418104a600b910c8b44f809a31f354f4800a34c701bbac7180b2db44",
+                        "s" : "0x1337c25db34cd48c5f773273c9c37129274a33565aef31133cdad840cc530059",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1623g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1623g0v0Filler.json
new file mode 100644
index 000000000..33d7a5b56
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1623g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1623g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610657606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeb276e377f83acab860e6af38b1bd6d1d7f4b7c043045ff37c15f3586d3628fd",
+                        "s" : "0x7f017bc5fcdad5ac867197ecbd80636d8a2063aa4fa29da6418a3cd7b21319ed",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1624g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1624g0v0Filler.json
new file mode 100644
index 000000000..d39d6d52b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1624g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1624g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610658606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xff173cb160ed49888b6cf5181212d5c50a4843a25de8060b820c264fed8ff5a6",
+                        "s" : "0x08e6ece5a8e2d98ef7d3d7e206763646028d835347d37bc995836c377f390abb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1625g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1625g0v0Filler.json
new file mode 100644
index 000000000..91b043e0a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1625g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1625g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610659606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xee5f97ac21fcf7695a940d8b26243debf55b772f7826c01e4a40618783cc7bc4",
+                        "s" : "0x4d532fb69dc43b35acb9b993a1457a8ef46d81dfacb544880b3d0d422aada272",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1626g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1626g0v0Filler.json
new file mode 100644
index 000000000..7d82180c2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1626g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1626g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61065a606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1c3cd82cce8fc9a2c129f2c6ac7d313d140ff8bbc2f978aa80c97d78414d6e24",
+                        "s" : "0x451cde851d46285a4b2d8a8d261e095c1f9ad243db1dfd827e22b9aee56c98fd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1627g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1627g0v0Filler.json
new file mode 100644
index 000000000..d88db5b06
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1627g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1627g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61065b606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe25708699d87b5e6692e48e2ed2dfea45b89f5d51b3db13d8e997224f0a29d1e",
+                        "s" : "0x481f9af265193392b78965074b1a9744818eae1be855fa2cd47f4f9e68fca2f0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1628g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1628g0v0Filler.json
new file mode 100644
index 000000000..58c4699de
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1628g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1628g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61065c606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8a8832832c6a7717bbd801345cd4256bb544834c1cf64597cf66db4640f710c5",
+                        "s" : "0x2f8990130e8f75dd00f3ad194f237f28fc20c1355fbd4bf5248718ecbed08fa4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1629g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1629g0v0Filler.json
new file mode 100644
index 000000000..23a157515
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1629g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1629g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61065d606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb6f1292af2b7bc26bc4aa32b80e72e015f1fb8a2899e87423741a4a9def5c31e",
+                        "s" : "0x44c9b158fdab3af29af66ba4cf017d6fd43ce61dd951bb88e2fd409314bddb47",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d162g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d162g0v0Filler.json
new file mode 100644
index 000000000..8194b5aac
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d162g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d162g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60a26064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe8004ee941b7fefc55108fc66f3976929029903404f1aa5d067ea78bfa6944fe",
+                        "s" : "0x2904b0156644822a1fd36c0ec1308a4d87bd923953f45c1e14e870343658b91d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1630g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1630g0v0Filler.json
new file mode 100644
index 000000000..9e0671dbd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1630g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1630g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61065e606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb70accafb3f132c5e60207adcc04cee39659bff13fc21cd051f16b55a7284b45",
+                        "s" : "0x2fd37661346b0c837d7b5e1fbb4927337d338c1b076ff3964b071aad3f884ef1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1631g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1631g0v0Filler.json
new file mode 100644
index 000000000..6fb3ba05e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1631g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1631g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61065f606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x25e1a296e7c7a8482d3dd53ed478f64af40de40e857d512c3385e9aa6f44283d",
+                        "s" : "0x31691e1044b03e3c9bd2711385e5632982794c048c34d445ef5625d3858a0fa8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1632g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1632g0v0Filler.json
new file mode 100644
index 000000000..3fddc8e14
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1632g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1632g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610660606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6de2e11eac456a5a9bd1e095499eb44ad1ca895e73f14bc81c13457d58fcbcd8",
+                        "s" : "0x5a08aabe7c9496d035d64a7ab827fb2543aa5008199aa4469db36090345a6e30",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1633g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1633g0v0Filler.json
new file mode 100644
index 000000000..df2caf615
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1633g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1633g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610661606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xad3cbaac2c977d4f00172c8551593eb426155af7650ab700e40f271c2e69ac4a",
+                        "s" : "0x36bd0a00666d632b597b1cdf9c5c6c7fed14b680ff877e0f7bf7f06ef1ebb466",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1634g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1634g0v0Filler.json
new file mode 100644
index 000000000..4ca6997a1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1634g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1634g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610662606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x918d2fff2e251ea4a7bfea93a6e5ee409b988a66c2a3f1703a8fc3d5cc903607",
+                        "s" : "0x3a95916b30f685972ce208cbfd400062fd3b2c1e52d0e95e14cf13b85f907762",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1635g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1635g0v0Filler.json
new file mode 100644
index 000000000..09d0df549
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1635g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1635g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610663606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf7b7355285c3efffa00e45c1a99eec1224d59a1d6281fe8dd6acf83bc69a69f6",
+                        "s" : "0x389f2986b2c2960810b1f1c3b14d5fd4ee8748f4f43448de7f2a6766399e5ef7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1636g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1636g0v0Filler.json
new file mode 100644
index 000000000..c8651a5df
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1636g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1636g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610664606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x72a54e03852bccfdb172e8d099e1ca3a49a6a188e7f3218a91097b012c53dde4",
+                        "s" : "0x730f604c553fcdbfc7a38075a54fd1a1b2e7af4c1a9c108119416e534ec18e63",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1637g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1637g0v0Filler.json
new file mode 100644
index 000000000..ec6cd5127
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1637g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1637g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610665606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x59d58d7503b1cc2bce429d808feee9f80d7311e2b26bcf63b14b6045d63a64e3",
+                        "s" : "0x69a20ddb996e8b344482e45b2223ae29f62938ca1c236ad44ebba93b3b258362",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1638g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1638g0v0Filler.json
new file mode 100644
index 000000000..8c327c30c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1638g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1638g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610666606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbeb22750a0d0a509b51080664b57a46497ebd49b89b6d84d30b891b300317372",
+                        "s" : "0x3c89909ec9d0efe73ec1066ece27d6ea27aab298b5a4ecd707fef6e1796924d7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1639g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1639g0v0Filler.json
new file mode 100644
index 000000000..a0c0dd2e0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1639g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1639g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610667606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5fa51c60fa7c06074cf4d9c91eb67a07dd8aa49dc7a9e4fc9273b4af9691fc58",
+                        "s" : "0x14e4abc078813c9d2b362c8136611685ef503f1ce5478619c80d3164b3b723bd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d163g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d163g0v0Filler.json
new file mode 100644
index 000000000..5e4433c3f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d163g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d163g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60a36064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x11c210e2b414eb2e1c13a283d161d4f5c493ad252d21b85daba85aef9ed9ec0c",
+                        "s" : "0x14760dac8bfe69d6adb43e40341a2fd7aabc4545b9de8d74f33c00aede09f97d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1640g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1640g0v0Filler.json
new file mode 100644
index 000000000..56eb2fbe8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1640g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1640g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610668606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcb98db0bb33479018c98e8cb69b00d82b7005f310652241850df9043d11754ed",
+                        "s" : "0x05406f90cf9e55e8b4cff9f2fbf02368e8e94df5a174c5dcf65d5da0e32e5991",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1641g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1641g0v0Filler.json
new file mode 100644
index 000000000..0faf95c60
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1641g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1641g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610669606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x71f30240812bdc745fe1c54fda8f51d0f18f7602db6d2ad13a33471b82d31b3e",
+                        "s" : "0x7c710f0638fbacd838bbba10ffba7d9bbf0ed18eae78b65a1717e7bdb04f55a5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1642g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1642g0v0Filler.json
new file mode 100644
index 000000000..668194df8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1642g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1642g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61066a606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd5c5ec1c05105b19eb24ea2300841236d6ca1237e6e0fe363ec1edde9a8ea6f5",
+                        "s" : "0x3e919346339214dc09d1e05651540e8f6e6f3255b82d3f8b25a79b1b1b849438",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1643g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1643g0v0Filler.json
new file mode 100644
index 000000000..d47112a5c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1643g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1643g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61066b606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2be367a3dc8fdb6c8e3c72dcca5a8fd7f11a098065de8de67b250ab9c8bb14",
+                        "s" : "0x21bf9a7d0dbde06c8167f27ab0332e046506d3142c86db3316bfe90268b7c731",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1644g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1644g0v0Filler.json
new file mode 100644
index 000000000..08015e414
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1644g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1644g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61066c606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8c0a23fd313f345b00e7d476734da633af9a9770ffb6971e517496b5e67e0dc7",
+                        "s" : "0x4fd5b4436a9ae04fabdceb9f1e73d1ceeac0bafdec5dea6f8f6b4e93e27d3c25",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1645g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1645g0v0Filler.json
new file mode 100644
index 000000000..b4f821488
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1645g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1645g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61066d606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf270e8ff250ce4d648db72be31a152e3c1005fc9a7d21570d6163a969a93fd03",
+                        "s" : "0x7fa6723dac72eb1074658972314ff2f84fc7d167e0a55441ae97dd2278d5c403",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1646g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1646g0v0Filler.json
new file mode 100644
index 000000000..557f60181
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1646g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1646g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61066e606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5419fd81912ce19097a03d74a9d0296dbc2d94c33bebbb3e94b49f021f9bcad2",
+                        "s" : "0x5c4684bddb3ad28511a918de34b9856ddbeee7b1c461f746dbd0993dafe9f0af",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1647g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1647g0v0Filler.json
new file mode 100644
index 000000000..d1c41a2d2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1647g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1647g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61066f606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x587df09aaa3f50876a0b0c7d3788ce51101e778a33a88a3aea238f6f065f51ab",
+                        "s" : "0x0e31284b1332fb1840e1a9f8dcfb5474ff1c084a70db4970f5ac5145fdc0613b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1648g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1648g0v0Filler.json
new file mode 100644
index 000000000..e45d4f9b0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1648g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1648g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610670606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8dddf6e2fee9c26622f094bf0bcd2d34ede8237106a37ab2916fbcf786d922d6",
+                        "s" : "0x6e3fc3f26782233289824f6221a11ec4239d2c22512b229d099bb5d604e896d4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1649g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1649g0v0Filler.json
new file mode 100644
index 000000000..e9a68ff48
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1649g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1649g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610671606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xba533e09065a0a44f62dc07d986051878d062147155ebae88d20035a6938cf1b",
+                        "s" : "0x27d67efda5ad415b609643b79217cc975892ff8dbd7db908d99c02f854a8e856",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d164g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d164g0v0Filler.json
new file mode 100644
index 000000000..ff8f92145
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d164g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d164g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60a46064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x342d983747570daf93f9dedd96c42cc11cd1df884542707b743361cc1b13241b",
+                        "s" : "0x1cc3fe237d1be85ee51a48e07d160a5e957d437a82ae1e9bc01c5deb8a706cb0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1650g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1650g0v0Filler.json
new file mode 100644
index 000000000..d1b8c6115
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1650g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1650g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610672606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbb906d25a79cccdd53b8877a2e98eed734e80a9f29e9c515e53b6f28f428a9c5",
+                        "s" : "0x38f103cb176cb28a30629fd93f4a323665a1c8e9d41f549202d7bac62f6ba93c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1651g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1651g0v0Filler.json
new file mode 100644
index 000000000..2b94085fe
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1651g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1651g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610673606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x45ffacd8ae94fbc39d0e6cc4a4c05de53ade47539af51ca6d492717e328eebc0",
+                        "s" : "0x3e19604ede965e25ea328cf4412be1f4fe1e1393bb9bae0731d75944469ea114",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1652g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1652g0v0Filler.json
new file mode 100644
index 000000000..24846f87d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1652g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1652g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610674606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfc673af2a906f29c04c79680535110d24f26b34a1eef3d21679d817ff30e0db7",
+                        "s" : "0x0b12a268263fd3986202261e57fb8ac205e7cb1cbba77522d836f5d33b97bcae",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1653g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1653g0v0Filler.json
new file mode 100644
index 000000000..a0fbe2550
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1653g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1653g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610675606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xda54dbca0b18bedce9b1185e6330a6b983143773fbd487d6e6fcacd99dc99a95",
+                        "s" : "0x2ec446fd200721d5bdb785aa89fe3754c84f9b35f0845d743ea4f686b901cf38",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1654g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1654g0v0Filler.json
new file mode 100644
index 000000000..2fc626e6f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1654g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1654g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610676606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x91006412bfefec7c5caff1135e3a3595852e9a76954903bee0941852ec2533f0",
+                        "s" : "0x2afe84886e7339cf7e95d7f080dd6fe49276f05792d6dd15a2a0241e07fc13be",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1655g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1655g0v0Filler.json
new file mode 100644
index 000000000..0400502e9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1655g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1655g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610677606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5ce1ff50a0cd7cc09c2b053251dd759d909a29012a87e91cead6ce90060f2a83",
+                        "s" : "0x559474e713874599695eee8500062f1dfb397bf4e6a5ee264fb0745f5aba9464",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1656g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1656g0v0Filler.json
new file mode 100644
index 000000000..f06b83dd1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1656g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1656g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610678606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x12a7010bfb0565136374c43777dfc9cdb8c029a92484781d2ee6f534fc49aa62",
+                        "s" : "0x4c981c5b83424c7e845f2c2dcffce04e09abbdcd4ea96f1c1b14fdeb369ddee4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1657g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1657g0v0Filler.json
new file mode 100644
index 000000000..ceb0a9e4b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1657g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1657g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610679606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x259f00f600c8d37f94731600711c64197ec6ec2e25113c21cdbdf6710873bd3a",
+                        "s" : "0x20751f7feab6ba102eb51e3e9b0557239116c4d6502be65703b82e9b4b481440",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1658g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1658g0v0Filler.json
new file mode 100644
index 000000000..fcd67fd1a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1658g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1658g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61067a606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x854308bc9e2fd120e0f32ad5347289a961de1c5183f9ef12992e33e27e41e555",
+                        "s" : "0x224c1c9e87b66bc679c6b9ce71d67a6989555d4ea6a9ce5ffa5835d80e5db77e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1659g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1659g0v0Filler.json
new file mode 100644
index 000000000..b10c4680f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1659g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1659g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61067b606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3ac9ac9b849daf44dbd46ebad91f514081911597e2cac49c2057b40874e91639",
+                        "s" : "0x4d9abd251880182015945502b7221d2d257d69dbceef4c8f77d16fcd0deb8ea1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d165g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d165g0v0Filler.json
new file mode 100644
index 000000000..e65dabc7b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d165g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d165g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60a56064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2b7b70797b3921b3c84b3c6c78684a824a4fac8a8e8f51c0421155da6ca2fa82",
+                        "s" : "0x2ed5e94c93ad6bbeb0ec1b99b6b9338b62fd905fed43b543a4093333207e078d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1660g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1660g0v0Filler.json
new file mode 100644
index 000000000..61fd5389c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1660g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1660g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61067c606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xae67ca2737e073313a375c3c8ea224d840bd5e639d54953e7015f7fafd4680bf",
+                        "s" : "0x2561c782115aae43d2702bf30225615dc1ac108a89922476053c0988cf46e1e5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1661g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1661g0v0Filler.json
new file mode 100644
index 000000000..31bb022ee
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1661g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1661g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61067d606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x508f471ffe3bbd3d7ad0e234080d7706721791ebf902de5d9cdf910278a2ba26",
+                        "s" : "0x698cf40919aef725be60243a69ef8e2923661e35bba3045372fdbae4370c2c6f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1662g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1662g0v0Filler.json
new file mode 100644
index 000000000..7c81a54f1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1662g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1662g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61067e606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf60b3450887be8abe0dad41d6c035514f423ed76e217cbfe14604a514bad0972",
+                        "s" : "0x14428be092a6685afe8d6b41cd29c25d980c747167fe2d6adf79838b0129284b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1663g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1663g0v0Filler.json
new file mode 100644
index 000000000..6f4b19c92
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1663g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1663g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61067f606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa22e5637f958279494e9c4c66eb70bce3fcfc05a5ee5a581513169e13cc9a906",
+                        "s" : "0x3739e93766e31c226ac4912cb0c9b6f3eb9bd786a0f0946ef921cc333face6d4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1664g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1664g0v0Filler.json
new file mode 100644
index 000000000..3b9f84722
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1664g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1664g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610680606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7a50fd8f82d820d2f045ae51ecb4260c52f9268c43e44039634758fe659b72f7",
+                        "s" : "0x3fdf0670caf297f775c362a9908b5a6bb16174effa1c606f77eee7bfbfe6146d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1665g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1665g0v0Filler.json
new file mode 100644
index 000000000..d9d8e684a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1665g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1665g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610681606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xee943ff0789b872bd59dd0bea1b81645c90ab8612f50d1c0adc3039fdc8885df",
+                        "s" : "0x3232566797444deaaecc08e17656f1341dc69f4e632171e88d6cc21537546b38",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1666g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1666g0v0Filler.json
new file mode 100644
index 000000000..2e9fa64e3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1666g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1666g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610682606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7691954e23014f68d0e634356c7e060b11f19632964fc14ea5de89d3c9b38ce5",
+                        "s" : "0x7b1b168cf795c1a71e3db8170a0bb2368e8fbc6c393d05504326dc65955f1f97",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1667g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1667g0v0Filler.json
new file mode 100644
index 000000000..bfb294000
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1667g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1667g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610683606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5ca96596fdb873ca0c1edcc19fe4b3b926bd5354494985420043ae37f53eba4a",
+                        "s" : "0x67b05ae437a7d14c7c974b5ecd7b38b98f407fe19071725d67df539e69281b75",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1668g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1668g0v0Filler.json
new file mode 100644
index 000000000..b833b78e4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1668g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1668g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610684606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5da4774a5feb181fb3afe8857afd651b4acea4033e238a8bd67f1b4756193eb9",
+                        "s" : "0x55ebdbc297a2f24312d389539dc38d601abe9d3e3c30318433fe6e1f4046862e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1669g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1669g0v0Filler.json
new file mode 100644
index 000000000..4227c088c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1669g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1669g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610685606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4e00137fb17435db652ab0bc508d9f1121b06e77090376b36ecb44e186ec0045",
+                        "s" : "0x18c38afb4301e20d92dc4759f3d43c091690006c2c5a41d46ec5ca506eaeaeae",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d166g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d166g0v0Filler.json
new file mode 100644
index 000000000..ca970fb15
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d166g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d166g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60a66064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc8d308649a61d81d5878f70e703665e2cf90e55194da0ab7f19f6395571e87af",
+                        "s" : "0xea94f57ed83d7d0b67fb4823a40591068f5413b8f7cb8feaba81d0c94170ea",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1670g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1670g0v0Filler.json
new file mode 100644
index 000000000..55ed6f3f4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1670g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1670g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610686606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf7f500fc6fc0a8d08cacaef48df1a099bfaa556912d144c092a5d97a25d59900",
+                        "s" : "0x1f7fdd27a1926f79473d9356120ffb2533965bddd98ec8d446e9d41430c40e30",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1671g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1671g0v0Filler.json
new file mode 100644
index 000000000..9c4d0b233
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1671g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1671g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610687606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xebe05c3937316e821324cb4312985f95180af3e639044da6aaa1347b4779f0e1",
+                        "s" : "0x399ca86672e5f996ce2944d8c46ffd73d625a2a2d4174867256773ed44369789",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1672g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1672g0v0Filler.json
new file mode 100644
index 000000000..db49e51d3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1672g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1672g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610688606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1d9a5ea201391a0411a793c5943cfa3f0610fb18ece6da563ddc71b3e3d6af50",
+                        "s" : "0x4a942abf54211d59dece68d101f41240757e4a435a95d1ea9b56ddd89f92c026",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1673g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1673g0v0Filler.json
new file mode 100644
index 000000000..9079a6516
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1673g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1673g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610689606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x95929ba0ba6fd1e01b58b3248d44d2f31ed1a9a79401e4cda51d33f740854878",
+                        "s" : "0x2ef802f6e9e1bb9f472a610c50a9c1fd5d56ece47b863f3b63d77ee03c801531",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1674g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1674g0v0Filler.json
new file mode 100644
index 000000000..f2b505d89
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1674g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1674g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61068a606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2c6eea71d7b540d76a44e6ec281bb97665a0e1a0122fe3d846bebaf4f03c4391",
+                        "s" : "0x5f568b941a8fc8b47d1bef2596bbb5966b9c273385a285aab133ae78e009567d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1675g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1675g0v0Filler.json
new file mode 100644
index 000000000..7f5e196f9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1675g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1675g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61068b606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3e02e177148d47d11cec36054b3930b942358924df7f142bc219070994809bb7",
+                        "s" : "0x7a6cc9c8dc4b05b21a8378666861868d204acc94387e0db9ec2770db94604068",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1676g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1676g0v0Filler.json
new file mode 100644
index 000000000..fedd9209c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1676g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1676g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61068c606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8f8da4760d860bfed68853aaff1adc6be95b073b206f970090536ea1f233dde8",
+                        "s" : "0x0eb008b3488dfe5bf28508c1b0577b72c54b1458abeaf8ed99c837e8017d1510",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1677g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1677g0v0Filler.json
new file mode 100644
index 000000000..dd03d1ce2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1677g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1677g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61068d606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaf4f8afe5f576168047b961df25c11a2a5d34f525c2120fdfd863d2b017496e0",
+                        "s" : "0x0f6473f8c510ebe4324a74ff7af35944b5849e8b61bd954dfb846ad5f4ce41d5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1678g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1678g0v0Filler.json
new file mode 100644
index 000000000..f7fe10df3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1678g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1678g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61068e606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xed8bcf7eec2176fbfd89c980ede725351a050c3785a9678987fb6e5a3978b1e0",
+                        "s" : "0x04b470ff213e5c8bdbcd6ea7675b3f7ac9407949afd8036172258ee2f686aaa8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1679g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1679g0v0Filler.json
new file mode 100644
index 000000000..d8e3ba2af
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1679g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1679g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61068f606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2afa18b13009526429de1ad05b1052eae3410396ec2d5a2602979047c57d6af5",
+                        "s" : "0x2ba6492feb4e5b6370da7a8334873440f676ffe40ce72327b5fddfc86c329b1c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d167g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d167g0v0Filler.json
new file mode 100644
index 000000000..527585fd2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d167g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d167g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60a76064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb63e53a916403386a16899ddd1bf8d0be4f91abc2fc2e0421166a83c61bedbb8",
+                        "s" : "0x09e8cfaf0eb0efc9b0f3a59e8a6012dc4259616e49be40905fe1db6e195260b1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1680g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1680g0v0Filler.json
new file mode 100644
index 000000000..de7712025
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1680g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1680g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610690606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3aa92f6a2807b500ecf81cbc51c46f4adaae8ae0ddd9ec2c5cd7f17ec12ed6b1",
+                        "s" : "0x7d56097c2d571053ebf620136fe8e104330d9d75c2661de818285b3744c92062",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1681g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1681g0v0Filler.json
new file mode 100644
index 000000000..d705fc8f9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1681g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1681g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610691606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf0b7aad8dbb3616180af369cc262aeba2ff403d3e2292fae94505f5606b0d56c",
+                        "s" : "0x62e964bfa2bd73b195c515d8d06f7da7197ea3c737d76018b3c327d7e6e70f80",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1682g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1682g0v0Filler.json
new file mode 100644
index 000000000..c57038845
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1682g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1682g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610692606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3aab081e3eb0fce0238e689163cd8f099bc41c2da01f48e8a63d8cf5b9cd186a",
+                        "s" : "0x4440c0e82980b2e415e4bf2c5a2cdd2aebc8026083da368372f4f14d12de5f3d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1683g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1683g0v0Filler.json
new file mode 100644
index 000000000..2fbc3271f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1683g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1683g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610693606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x10bf9d2ed65690dbce1807b59ca8ed03d3c4a1c2cb8f93fc77bc99af7608c25c",
+                        "s" : "0x390fdb46c8de5b9ec7ea6a3398f14b798e71d486a81466c5565005a3daba8fbf",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1684g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1684g0v0Filler.json
new file mode 100644
index 000000000..094b3be4a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1684g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1684g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610694606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbe51db6c66fd7f0bb02838d7c7342970b939a13128c6cd0b07578f5bc93cc278",
+                        "s" : "0x1fe34f475f85c95450e4fb4223f3d6bb79b2911292e78e97e29d21ee9da15edb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1685g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1685g0v0Filler.json
new file mode 100644
index 000000000..d349ee476
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1685g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1685g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610695606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x536e32f22639eef011ec4e87891ee4080630e44918b0f98f01d6e11f54bf4d4d",
+                        "s" : "0x2dacd4964a1165b679faa37c3c91f6aa585eb361221766fc726775042686f3da",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1686g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1686g0v0Filler.json
new file mode 100644
index 000000000..f401232ec
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1686g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1686g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610696606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5eea2d7b4e1930f5ca047ca171c7639d71a4a373ff14b2b37bc1b3b8632daedc",
+                        "s" : "0x022e038a0fb5ec1f9eafbbdfeef1365ff9e015e6af86759de210a92945845f85",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1687g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1687g0v0Filler.json
new file mode 100644
index 000000000..927fe9e56
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1687g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1687g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610697606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb01e9f9d7e185f9ce7d5b63a8fb4f2d8b07adee9ae7082a00b712df67eac5c40",
+                        "s" : "0x149617264d804096e13a518f982174aed3498cb039af0eea4e34e0ca85bb3d2a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1688g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1688g0v0Filler.json
new file mode 100644
index 000000000..c8af7272f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1688g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1688g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610698606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xffe13e860105a377f7c6e5ccd9e791f6ef450271be28e8eee6ebf2fc7a12f966",
+                        "s" : "0x37d84fc55e2acf6083b81e870e6b12c23ff6f080d5cb87d5039abfe8d946d83e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1689g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1689g0v0Filler.json
new file mode 100644
index 000000000..4575a0777
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1689g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1689g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610699606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x605452d70a7fcc2432e6af4eccb873ab24e0c9913b68648e52a43b7a1808ddc2",
+                        "s" : "0x11e6d7430444c0493518630b62eb4114837a718fbb640b846b5c8f6352122765",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d168g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d168g0v0Filler.json
new file mode 100644
index 000000000..ec4a18348
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d168g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d168g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60a86064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x082e0ea0d4846e94861e9ef964a73f8d844544e03809b3d1f4ef957757724688",
+                        "s" : "0x121a84866bb040e4538bbde688453a8a05966c30271f0494114a52ec4383fb58",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1690g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1690g0v0Filler.json
new file mode 100644
index 000000000..4fddd101a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1690g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1690g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61069a606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1dd978fb670d2cef90987547848521aeaeb58a80c4e12deb4a806229ec89913f",
+                        "s" : "0x3fbb7ace5321b92a42ddefab43bb20cdcab541c5c001478beb52e6190c5c31fc",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1691g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1691g0v0Filler.json
new file mode 100644
index 000000000..fc1baf887
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1691g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1691g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61069b606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9c173db02e9471532605e43ba4e46aaa7201576e5285156fc3cf75a0047096cf",
+                        "s" : "0x5a5893212605a54077d6a8a0d9e5cba3e3196c8de5e105742d73dcf0e91341ce",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1692g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1692g0v0Filler.json
new file mode 100644
index 000000000..7d1f0e27d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1692g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1692g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61069c606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0eff1be53bec0153e12c663ce12c0dd15dca88d9a78633163efe4c36ac2ac3be",
+                        "s" : "0x56b38913032c4f2d0149b6aecf82d774c2bc1c0273fa461ea2e9e1e2e4b75018",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1693g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1693g0v0Filler.json
new file mode 100644
index 000000000..be3ebe4d6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1693g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1693g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61069d606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfe70b944873c9c50bed619e3bf853bfb2a2342196c8df8b06bfd3b29b4663576",
+                        "s" : "0x58763ce039fd54e3efc77c412ce4e45dd8bb2ec44a1b7129289b608dd22fcf9f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1694g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1694g0v0Filler.json
new file mode 100644
index 000000000..bbb7e407f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1694g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1694g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61069e606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa5450454fde1738db757158cd8e0e7cc7e02140a9ed1f9820e762ef298443cfb",
+                        "s" : "0x7b3af4364a62dd7b807435300015d26ad97242cab4f93673947dc5086d0e1eac",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1695g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1695g0v0Filler.json
new file mode 100644
index 000000000..552916d08
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1695g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1695g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61069f606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9e81ade44882f8c75e6fd66080b5f1c51b015455c27ac8827fa82360703c3a15",
+                        "s" : "0x0cc0b493a4a3027c7ce5eb89e7e94b7c133c57f59dd647dbf98144a579136e22",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1696g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1696g0v0Filler.json
new file mode 100644
index 000000000..96aa4727c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1696g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1696g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106a0606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x97ecb887844d8a0fea9c6def3a464bcd48544999401ff5f9af8f1d55b3e742ee",
+                        "s" : "0x75ea2cc58f08e7dff0b9bd53e58a84f366a633f85064a56b4b68c35c113f1f75",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1697g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1697g0v0Filler.json
new file mode 100644
index 000000000..da2410c36
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1697g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1697g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106a1606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9c5546cdad3d9b73d98d8ef9a9a3456905e2963712a5cf34b4bde6bdf03e2b87",
+                        "s" : "0x536863b9ab29bc6a8be655fef88c1ec613217271f27128f1d3c46054fe1bc880",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1698g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1698g0v0Filler.json
new file mode 100644
index 000000000..512ff8119
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1698g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1698g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106a2606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd8f88d03b91ecb6707a1174842b1c9f3c3e2bf1e619993003f6775827eecd2dc",
+                        "s" : "0x0f51626d43941a663ce82e63d283f8b23008427df1e41a377fd749a631d41e77",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1699g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1699g0v0Filler.json
new file mode 100644
index 000000000..b56c9f31b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1699g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1699g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106a3606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfba8083a8212f0de59bf9a4687ede46b763f40f6b6bed78f601bedba6c9db52f",
+                        "s" : "0x599dce2a5b90433572dfd51217f4e530f2b24d53856e26b61e13e1955c9b9631",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d169g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d169g0v0Filler.json
new file mode 100644
index 000000000..94c3a6896
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d169g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d169g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60a96064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7b3bec22658aeb49d02dfbaf957076868637a5334017159cd010f9ecaf29c927",
+                        "s" : "0x0f71eed4a6eae3cb186cfe4314f899e341180ad06f607e8bcf90a2f010b5a64e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d16g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d16g0v0Filler.json
new file mode 100644
index 000000000..97f0e520d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d16g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d16g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60106064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x24d712f3658ab0bfc78d66ccb2886361bab15c95598d401b1b6745d260a98e42",
+                        "s" : "0x081f142ba259a77fabe8030d95b08e12458456d22b7748d4ad984bacccce068a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1700g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1700g0v0Filler.json
new file mode 100644
index 000000000..8534e8a31
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1700g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1700g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106a4606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd62ec9894c27217138d22c282091cc68743f3a2064f8a2c85a7ef3b331b8d6b8",
+                        "s" : "0x730e1bf5534ebead5007b6f2ae73080db1a136c54902125322c1afbaaaa11a93",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1701g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1701g0v0Filler.json
new file mode 100644
index 000000000..7f2be2578
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1701g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1701g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106a5606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa2c7b0328dd596e577398e119a4a8859437241a5a370b81e005266b1bc521e42",
+                        "s" : "0x209df8cdd2d97e593913e4e5726d65350185cfe9946900351341ba13f4330dcd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1702g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1702g0v0Filler.json
new file mode 100644
index 000000000..39162f2a7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1702g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1702g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106a6606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6c4f3700a9dea87ae4bdbb34db12369f659420ba4ff3520401594f6d6774fde9",
+                        "s" : "0x33cd6fdfd58cd2dad54d73a202fe5f8a053228e91146a53b64dea4ecd1db0375",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1703g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1703g0v0Filler.json
new file mode 100644
index 000000000..a79a31deb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1703g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1703g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106a7606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x097fb82c637fb8b32ae2357f91e46b7b2c1de3e696094412b6738eb5a70c7bca",
+                        "s" : "0x582e6303a5846c30cde37543b14d57712a2cb54fdef0c75a681e5b695419d860",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1704g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1704g0v0Filler.json
new file mode 100644
index 000000000..8f0a783c0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1704g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1704g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106a8606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaf17b5e938593caa55d919b326baff5a4579a63454769ed5e45078f8bba1e80a",
+                        "s" : "0x7871be33d527ec0c25c99eeae272eb75ed655b235bfc0bad1c3400c643a79708",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1705g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1705g0v0Filler.json
new file mode 100644
index 000000000..234dc0809
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1705g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1705g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106a9606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x44545265a55e6309aa8402655219a7d179a4bcaadfd07a4a8359fb558c0846da",
+                        "s" : "0x153d11491bd1a0ea1a67eb6c7cfce220846891f4c60d9f4656fc6531d271a9f9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1706g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1706g0v0Filler.json
new file mode 100644
index 000000000..c46213523
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1706g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1706g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106aa606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x21746da62b1be21ea2d24b6e027e63251a21db0b8ac28c33f97b0dc9603386f6",
+                        "s" : "0x3e58f5352f53ea43d864754519ed799bf437c1a794e20290d01f4ad569c758eb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1707g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1707g0v0Filler.json
new file mode 100644
index 000000000..f955a84da
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1707g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1707g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106ab606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb11761249144eb749c5a565b3ca9da59d8df3cb52a24e2923b79215f13394ec6",
+                        "s" : "0x018dc4b597253bb9baab38840b20dc4441549a972e2669e25c4a371191fa3cf3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1708g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1708g0v0Filler.json
new file mode 100644
index 000000000..dd7d274ed
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1708g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1708g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106ac606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0d9247c31e1b4d0a0480d6799b4ab69af72622faed6cc97d3b768f4a4f797328",
+                        "s" : "0x1d2fe41da24972097a44e160b6f90e634b7820c7b8b2b971aa5a7308a0f45889",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1709g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1709g0v0Filler.json
new file mode 100644
index 000000000..e90dc047f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1709g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1709g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106ad606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x19b8807c44ffa1aa45285b945d52ac63eb34ef470550fd227ea25668a13203ca",
+                        "s" : "0x26f4657525fd20bde85476cc5d2d7cf7e66a37188b2a6832019a3f81e464ff6d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d170g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d170g0v0Filler.json
new file mode 100644
index 000000000..64932eeae
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d170g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d170g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60aa6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd076d0ada74936a27c332b5b59a36c12954a5e402812da39fe9f0a7f34b4eb92",
+                        "s" : "0x1af480a7fe6a08c88d8d665090f5950de3809b124d30e0aea37b596f429c18a7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1710g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1710g0v0Filler.json
new file mode 100644
index 000000000..47e568080
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1710g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1710g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106ae606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4ddd478b29b990b0b77e3dfa70dc30dad014c4d8bcc8f8a254568f929a0dcb69",
+                        "s" : "0x0c6b3a0a70bdd470e7699ef413ca309391f71818ee19bdab5e00049145ba044d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1711g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1711g0v0Filler.json
new file mode 100644
index 000000000..9b0ee583a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1711g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1711g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106af606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x94485aef7f1b8afecd2f3ee7fc57049423a2a48c92d44dc425020e2202ccffa4",
+                        "s" : "0x645552e30cadbe9588c9223505da8aca031c75e17c5777590798df597df03340",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1712g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1712g0v0Filler.json
new file mode 100644
index 000000000..b9517b48a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1712g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1712g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106b0606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe6b0cd036675a84374fc6a82be5360b4aa02d55bcce1dd27313b546fe52ef038",
+                        "s" : "0x32480fc03f4e7e727c90852808f540e513e75070f61be169b15b03b5b212a8cf",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1713g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1713g0v0Filler.json
new file mode 100644
index 000000000..408e516d2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1713g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1713g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106b1606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x490f1bc7ebfb7c630541d03a0c4ccf2faaaee3731cd5da17d374ba0a937b3feb",
+                        "s" : "0x44760ffca996840a397e13d5d8394133b8be77f47d4986468187fdd0962c8aab",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1714g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1714g0v0Filler.json
new file mode 100644
index 000000000..a64c1f00c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1714g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1714g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106b2606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x71e502a053cfac2f5aa63be7aee15e9c995edeeec1fe8cf0354c509bfb75262c",
+                        "s" : "0x01b0243ba067339c20daddb498360b0c088d204dd609779255c1227886e914c9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1715g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1715g0v0Filler.json
new file mode 100644
index 000000000..8d843e32f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1715g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1715g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106b3606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa25a654d197f151891ac2461d033826774059ddc10b33f5af1d871abbfdf0fa4",
+                        "s" : "0x26fd201027a5604edbc5bfff73f8429c8f964ab9a9e5b119bf159cb3efc09527",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1716g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1716g0v0Filler.json
new file mode 100644
index 000000000..5d214e807
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1716g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1716g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106b4606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcc69151f20b74bd4ec7b1c982cbf7f70aeb26f668e2d6f7319a3bdf7e3980154",
+                        "s" : "0x477b8d963d6f3b92a484747ffbdfac90e639d5bc36bc76de8c6fd02b50523657",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1717g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1717g0v0Filler.json
new file mode 100644
index 000000000..0717160d5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1717g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1717g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106b5606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe97df334eac0c0b6a0755ae8251f39d68c2761e3bd45d427c5cd35590ec1b57d",
+                        "s" : "0x2195e9588efdbabaee19dd3f63f141c1e53ead4224e5a74423783a2395aca480",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1718g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1718g0v0Filler.json
new file mode 100644
index 000000000..7ea11f96d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1718g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1718g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106b6606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x14f13f00434b274ba73ba7bc3141eda7ef8cbcdc8c96b9786e197dc6e39c64c2",
+                        "s" : "0x5974ab109a17456511059d725a1b84cbe12f77d542504ec0d4a07fd7311f11ca",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1719g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1719g0v0Filler.json
new file mode 100644
index 000000000..4ce78119b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1719g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1719g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106b7606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x245333430c38c9fdfdac6dfc707709fe6ab3c5a1e565d77a9a35e6705c382827",
+                        "s" : "0x7bfeb223ff5ae7ff65825b9651a1ddfef2990a9aebf64b1e3a301b434e2ceb5c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d171g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d171g0v0Filler.json
new file mode 100644
index 000000000..6622d6f42
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d171g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d171g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ab6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1a2fee9e22fd2d1809496438901bd7324c0de739762fc9ee2165da81cff8438c",
+                        "s" : "0x77877fda13c15cafee39c650d1e359a268dfad0a122458ce4bc2ff60e4b97cbd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1720g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1720g0v0Filler.json
new file mode 100644
index 000000000..0a9078709
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1720g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1720g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106b8606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x14fcb719b51a7115ec7435ffd48bf14f26d4452273bddc3987a4426152e10f2d",
+                        "s" : "0x7ce42f03421dfb39ac25d75d21a407f9a1d03b9d165f1230c6bc103242cfc9c8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1721g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1721g0v0Filler.json
new file mode 100644
index 000000000..2d5864ccc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1721g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1721g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106b9606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6d325d42c8db22b8a9ec06312f4c8ee7dc5fb14f02c7c1f759db3fd3e6a8da38",
+                        "s" : "0x41071e0c6295e05863d585bd7ea0e030d6e5bf4ac066663e7d1c26b44103a0fa",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1722g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1722g0v0Filler.json
new file mode 100644
index 000000000..2ccab52a1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1722g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1722g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106ba606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa2cc20557a99982822f8f61a8c184d27107eff785826d8ca489e9337ebc484a8",
+                        "s" : "0x5f42a1d51774b32e717a8c23b362d941d955c8f643a23ded2add8088262a2b81",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1723g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1723g0v0Filler.json
new file mode 100644
index 000000000..9e2a57217
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1723g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1723g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106bb606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7f2f6766a54812c8751866f5082b0d816d056396a4de19015a135c2da373d83e",
+                        "s" : "0x4c2cad83fece05f6db4830b51dfd91fbba9a28562d9a87729d19414e4a3ab5ba",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1724g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1724g0v0Filler.json
new file mode 100644
index 000000000..1f245bec1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1724g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1724g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106bc606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd99621c73d4f4f7c92a72a739cf8b38ffa048c8b75a33ec7b853d8fd6c7a5c26",
+                        "s" : "0x2376ca1f12b849dd677f0605af6a26d1fc7944eda8ab05feee409b076b290f3f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1725g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1725g0v0Filler.json
new file mode 100644
index 000000000..9a70b4ae6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1725g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1725g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106bd606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x90936b898747d5e259ecd9a68b2992916a54a2970b6a8597051bb046a46cead1",
+                        "s" : "0x4bc7eaadc7a275d9bffc59f96cd05d3d6fd74802de1982864f4fa76f3f148d29",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1726g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1726g0v0Filler.json
new file mode 100644
index 000000000..b09119021
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1726g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1726g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106be606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe3e688b049ebc69bb357cc9ce62b464ee8a9e8b86831e97a12c25e9baf0aaa31",
+                        "s" : "0x21d6b211b611872fd33953f6230c3daea6e02784bf6288efa0b501661443c561",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1727g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1727g0v0Filler.json
new file mode 100644
index 000000000..187d1c9fa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1727g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1727g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106bf606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xde25e72b149e55fe45ca03e57566112be7c4fa39fbd804d38626862c92ec4e75",
+                        "s" : "0x172dbee810a7e6f0b2a7adaced0292dd3226ee8c19b5b0b88e65fe3ba22f92b4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1728g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1728g0v0Filler.json
new file mode 100644
index 000000000..937bb2c27
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1728g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1728g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106c0606452600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9e3b0e185dca5ae218a2e8b3dc771aeda7bf7ddbdd11b250ee980292c4f9c6ba",
+                        "s" : "0x067b64867fb304cbd2ae6eb6e39b183975dfafb2a14675f1515f2efde04ab404",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d172g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d172g0v0Filler.json
new file mode 100644
index 000000000..128660702
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d172g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d172g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ac6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5d55ebc0ce497537d2aed5be50748f969248a365533c74d49232ffae029ebce8",
+                        "s" : "0x044ce1db86c5ab087f404fc2ac6a46cd4ef0509424214a9ab95707b6c734c194",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d173g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d173g0v0Filler.json
new file mode 100644
index 000000000..7cd546fcf
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d173g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d173g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ad6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x39f6300a3d91647f8711df5b5882ee083e0431e2a394b2c7137a7c351b60a10f",
+                        "s" : "0x59af15acd88c17cb08b6961ec99f4193fc766576a4862a046ae7c9ffde9f089d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d174g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d174g0v0Filler.json
new file mode 100644
index 000000000..b65a86c5c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d174g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d174g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ae6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x04e1c1faa5bd09ad431a8dd4b748b73b3b20d6c7b2fab8f680669f306a432d14",
+                        "s" : "0x4620e2dcbf2dd8e29d44a39ef1c289b8c0992e38eb9b610ce11f4f5f051893ce",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d175g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d175g0v0Filler.json
new file mode 100644
index 000000000..a6faded4b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d175g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d175g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60af6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc7735ebd5c429bf7ced2e38c716e2567b117c8f76e443b11347b18eeab62bc4a",
+                        "s" : "0x4e9ba53f43a3dd0013883f460c0326aaaea73b8aae787ddceb58f6158b20f687",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d176g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d176g0v0Filler.json
new file mode 100644
index 000000000..79b6f50b5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d176g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d176g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60b06064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe7da9b6505a84a748b8561462178a974ca4928b4816452f26d5dabc348383813",
+                        "s" : "0x7052012a2e2ec62cb9744e916e7fc457fad88858b927fd5d2274f66fb776d3be",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d177g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d177g0v0Filler.json
new file mode 100644
index 000000000..e833645fb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d177g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d177g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60b16064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x24a4cefa26fc69b91ac2f004c7234bf54ba63a3aadff90800b3d68103c0401a1",
+                        "s" : "0x2c312cd0405b1dd4edfe34e1e22fd228dddea5f9e4e50dc39ad3f42d3284fe94",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d178g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d178g0v0Filler.json
new file mode 100644
index 000000000..a00d84e11
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d178g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d178g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60b26064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x06415a541541ff23d184d445d00f2ccbb59966b19ca0692c3f03f0ab4ece68a9",
+                        "s" : "0x55259d9426ac0d74451cca4f5b856029a25d2cc22cc51f80b7ffef4dc0a26c10",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d179g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d179g0v0Filler.json
new file mode 100644
index 000000000..4ea5a2a1b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d179g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d179g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60b36064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0761e0207b003311f1bb5bf2502c08a9d9b477260b26dce517edfe807d30a9e6",
+                        "s" : "0x5dc07b3bb6ac4ee4561b86498fe9ab789a5657a68bf40c1bb97ce7ed41e2391d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d17g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d17g0v0Filler.json
new file mode 100644
index 000000000..e8abb083d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d17g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d17g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60116064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9d6ebf7391500fbd0c8dfadbc82962b2c6262541db3b834cd06700e054be206f",
+                        "s" : "0x396cec6c1f7fb24a1f428d4ceee8bdf9262ec4a537869c38992f47b4caae7224",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d180g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d180g0v0Filler.json
new file mode 100644
index 000000000..f3124ab4f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d180g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d180g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60b46064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x922bb1e0ad561ed867163994d32c9ba2e7f5aa0d9216ca0a02c94218e220896f",
+                        "s" : "0x01f4b7e64153ed9e3789285598b1e22a4417a8034aff18913b12716cff4a110a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d181g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d181g0v0Filler.json
new file mode 100644
index 000000000..e4ee80692
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d181g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d181g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60b56064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0e8107c7b255fb1055d4cb252100dbb250e7313ec773b82c03be8a498ea35f00",
+                        "s" : "0x109205832c83b9dd1f279b697e12e851acacd475855eb1ba2c9a732e2fc5f7f6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d182g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d182g0v0Filler.json
new file mode 100644
index 000000000..8759a5588
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d182g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d182g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60b66064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x84e2c98da994a6d85d0079c00b3c86efe1ad8d884a14984bf9a54ab85bdf3651",
+                        "s" : "0x4f08a2bbdf027159fc87ee9dc3a2ea115566b4e14a00c2cf7639e4d2c687a965",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d183g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d183g0v0Filler.json
new file mode 100644
index 000000000..66c167ff7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d183g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d183g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60b76064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x54064d1eda47c338c889bb8aa1fdb5143db5fc716fdd76cb409b5ebff3a3d26c",
+                        "s" : "0x01d00c41811568857a19e6d76dc8b3c973ade8ee551400ad125ed5c1ff09b935",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d184g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d184g0v0Filler.json
new file mode 100644
index 000000000..05e8555fd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d184g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d184g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60b86064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x597abbe3342e254c31f8a0e74e8bc97a1cb816e742a9d63babecd1bc5777c2e5",
+                        "s" : "0x7e2e70310f63d3d9b1b250074ae5735735839f2f5c3a3c67932fa38f3c6cbc6c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d185g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d185g0v0Filler.json
new file mode 100644
index 000000000..3a0228a7a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d185g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d185g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60b96064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdd80ea741bda94fc54ff4d0ccc0450de62d36a1607147ef53d36a66d89aa6376",
+                        "s" : "0x56bef27b0ea6ce648656c0fdf293c2ea9681c3479be8ce36f6f10d09c167574a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d186g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d186g0v0Filler.json
new file mode 100644
index 000000000..d050d9a25
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d186g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d186g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ba6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb41924d4c2ed73d3aa93cfbc4ef3350019cc9584d026f53fedde5ce958744db3",
+                        "s" : "0x75a7dd6250584bcf23df1ac973f3576e2a163e8b6160425a5ec7317d02564e2b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d187g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d187g0v0Filler.json
new file mode 100644
index 000000000..dc0481705
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d187g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d187g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60bb6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7429a264a2ce493c08fc2803bb5ed9df7b6476ea2c7c7148ecfd11bfec621f9a",
+                        "s" : "0x33abf22f5c46daca9418efdec778a926267f0a3e5869cbba9bed2e7ee33fb01b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d188g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d188g0v0Filler.json
new file mode 100644
index 000000000..f2b8b7191
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d188g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d188g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60bc6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5fdab56f38d2ec88cdb4818f517b1c49e7761ca144e6d40df24b33f39c42357c",
+                        "s" : "0x2dfa1a2fd8244b3c914dda50aa2bc290ca4806893b1781055ba07ed847f27522",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d189g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d189g0v0Filler.json
new file mode 100644
index 000000000..b55f04d8a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d189g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d189g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60bd6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaddd4c5a19ed8f38c2cddf44971cb0fca67fe326b7d961fc7c92c14f99e9ff3e",
+                        "s" : "0x5f4e15e81137bce8dafd30f759712a123a691cb0571a0a27ac40e6465b50b27b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d18g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d18g0v0Filler.json
new file mode 100644
index 000000000..7396819ab
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d18g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d18g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60126064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x92d372c9fc5f411ad4c682f42362c60f046a0d774474d01a47d6fbd90ccdcf38",
+                        "s" : "0x7cccc7358a996d12c63543a5909c1c5f1a59dfb4bc152d4281cbf00c3783c8fb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d190g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d190g0v0Filler.json
new file mode 100644
index 000000000..62196c2ea
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d190g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d190g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60be6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd607f71fa7bdc26ee5aa9bd38815e92bfe219c11d20c0be3a90f6e315f164f44",
+                        "s" : "0x28a9677f29208ab0b327e590584e53d65cf802266af6db7ec0603bc08d8a891e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d191g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d191g0v0Filler.json
new file mode 100644
index 000000000..ed4f3db9e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d191g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d191g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60bf6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc676275afa95e51cb4936cfda8aafc51408a830836f856a5298ec37be9a245f2",
+                        "s" : "0x6b9191499d31ed6393f9c2f9829b93f64f79e1082707ecf1434b01989a6ce7c3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d192g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d192g0v0Filler.json
new file mode 100644
index 000000000..70b0a3f99
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d192g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d192g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60c06064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1efc35f27bace298725828bd6ca852c04ae75c7dd201a8f08f0a70cfc7318240",
+                        "s" : "0x269e7067a1e1b8bc05059e48cd22e39dfac525ffd38e9c65d450ac2e4b320409",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d193g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d193g0v0Filler.json
new file mode 100644
index 000000000..d7b06852e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d193g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d193g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60c16064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x09e10ee417618befdbe8231311629908da6f56a5cd0f88e44705d49681f91485",
+                        "s" : "0x23f04936506bc575c32ccf93253549acd7d545ce03e327414abf224c6f761b55",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d194g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d194g0v0Filler.json
new file mode 100644
index 000000000..d640f07c3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d194g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d194g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60c26064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf521391d606245b5e5dd316eaf09203a7683536791b03a032494e2aff65d6f0a",
+                        "s" : "0x280cdcd48ce48bcf288cbcbb30959c8e09460a216df20b5b3641f745d7086327",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d195g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d195g0v0Filler.json
new file mode 100644
index 000000000..0e8726cfb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d195g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d195g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60c36064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc2afe6bd83d58d7007266699fc57638491fbd2334d3771acab9206e8b574e98c",
+                        "s" : "0x240502a5827bb77290e23c52eec7c8d62cfe604aadf1b503b2ac587129a68bc6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d196g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d196g0v0Filler.json
new file mode 100644
index 000000000..249be5ba0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d196g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d196g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60c46064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3db40a046580fa9951c5f37ae1840a07f3a42ac827fcba5cb962e957618963e8",
+                        "s" : "0x235877eb51e587415af33f0309dd52bb0d3b08c4aa6fb8b98027e829cd7c75f3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d197g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d197g0v0Filler.json
new file mode 100644
index 000000000..fe5458878
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d197g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d197g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60c56064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc7c984ca1ce3a1764fcb7ed138a7359b6bef5640f57a1e85d23d5eaabb83dce4",
+                        "s" : "0x33208c4aa6b95e90c1c2b9bef90d0699edad39d21ba3b5f2e454c0f4a7b0f134",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d198g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d198g0v0Filler.json
new file mode 100644
index 000000000..eee434e4c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d198g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d198g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60c66064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x312520e5967218cac053a2e72e0974653efcc3b85d2e042ba4e60995cf57a90f",
+                        "s" : "0x21d7332d5f2f8446619432fb092f097538a16f349b8d00e481aaecfbf5fc2c0c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d199g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d199g0v0Filler.json
new file mode 100644
index 000000000..b887085be
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d199g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d199g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60c76064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbbb8d0fdb42e72216c66bb293b1367fd8798995f236c43d9b5dc3bc011b742ec",
+                        "s" : "0x3bbd1f045656d0aef27d94cfc2fb7afe9c6d6fcc29cabfafb85661e07b303729",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d19g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d19g0v0Filler.json
new file mode 100644
index 000000000..8b1599a1b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d19g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d19g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60136064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3fa1045d0886138c9e6400c9e307ee8472d08a6a2f3aaf1dabda438452e6b326",
+                        "s" : "0x3a529a8dae07bab6a08f4e7ecb78249245b9a8e2ae54d945a4196bfce6cf11e8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1g0v0Filler.json
new file mode 100644
index 000000000..3fa486678
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d1g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d1g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60016064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3ac7d83fdbf6e8dddcdceab5097c6d41d2cb47d5e6201ec20e33524555100bf8",
+                        "s" : "0x6cafd110e245ba1e4280e583dfddebee06ab555ad89779aafdefc7109407e4a8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d200g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d200g0v0Filler.json
new file mode 100644
index 000000000..4e948178a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d200g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d200g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60c86064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x563dfa40b2af7ee21e84412e4d731f37e7d1c65b806568c083144f5f693b9658",
+                        "s" : "0x7ba79b196450018e12460f08c0e484c69c35f0161b72b43a6306abde2fd7ee5d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d201g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d201g0v0Filler.json
new file mode 100644
index 000000000..f8f7babf9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d201g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d201g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60c96064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x529296d43ca778c822aa5c489256740a93a96b7578667d5d9a9d0333b4f5152b",
+                        "s" : "0x46e1792bff78569a1553ca896a7f0d00993c21ee8fac50cb0d32f695f3f51930",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d202g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d202g0v0Filler.json
new file mode 100644
index 000000000..732e766f9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d202g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d202g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ca6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc3fe59e8d05d7471d6fd5e0aeb94a622965eb323ce3809ec89849862b8cfe923",
+                        "s" : "0x03030e29ee86ebae31b7db3f37d89125c7d188ba102d04c87bd3853f19ea9574",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d203g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d203g0v0Filler.json
new file mode 100644
index 000000000..f6401d430
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d203g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d203g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60cb6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x27f0aee2d58d1abf8e299395c6821923a1090b083d6a605e2855f324b87a63f0",
+                        "s" : "0x50b29eba5917049cae1ac68c0aaa7246b708c6ca7baef9e517184d01492fd7dc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d204g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d204g0v0Filler.json
new file mode 100644
index 000000000..4b9056bde
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d204g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d204g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60cc6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc753763628f5ba498da014f99a4722da9e47b9ae8920eab7869106a5449d3a44",
+                        "s" : "0x09538b4c1b7860fccc5e955335c781f6e573e36589b13a1ad966ed7fafbe0a7e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d205g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d205g0v0Filler.json
new file mode 100644
index 000000000..7dcbbe669
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d205g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d205g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60cd6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0c17c574ed3ce1a832590b84a90ba5406368b3b27c99c53b06f2249903bf7dc1",
+                        "s" : "0x5ff0d28a955b6f2cdf38f4cf4ef9034a6f949844bd14ac4ebae2e0f13a279db8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d206g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d206g0v0Filler.json
new file mode 100644
index 000000000..ee3cbdd72
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d206g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d206g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ce6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x717017ad7f69d683b868eabc98ad4c1a5e4f0c3c4089d6796e08610a95f1e3d1",
+                        "s" : "0x5bfe07e3e285970fac969eb52cc892fc77daaddbb3544a07e00c56fee010e30c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d207g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d207g0v0Filler.json
new file mode 100644
index 000000000..24314f01c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d207g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d207g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60cf6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x96523cb8a948cf03c1b5fc8908b07ebcf9c1e5e27fbf470b59ddc44612f800fe",
+                        "s" : "0x13eb5a6479ad8d9fabbfc889373609d9c73ac80417bf150d260943513ddd4c99",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d208g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d208g0v0Filler.json
new file mode 100644
index 000000000..109999e6b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d208g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d208g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60d06064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9962ccc79b75fee5a70206a64ee7da0257c4e4843ca50862ff12c62252e332ff",
+                        "s" : "0x3c1bfc58afa82f10ab54c3a45bf789e2f2a8652d20c42eecd321fc1122967f6e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d209g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d209g0v0Filler.json
new file mode 100644
index 000000000..d4b8598df
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d209g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d209g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60d16064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x56f054a537fa31b1fd1482349777c4519a931da604f1432afa5f70adb0bb655d",
+                        "s" : "0x3cdaebc7d7e810ccee889cd18d7d064dd31b2389dfe115cab526d981b0eaa4c1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d20g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d20g0v0Filler.json
new file mode 100644
index 000000000..aa9f59c95
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d20g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d20g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60146064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x895822067c0c4c9e4643d354b5d90e8b9145f38e174478355b355bf51ca343dd",
+                        "s" : "0x05370678fa32c4a5d6ed10db9df9ff2274517db1fb1116c9f80f5fcf6fd49b89",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d210g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d210g0v0Filler.json
new file mode 100644
index 000000000..e8afa4128
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d210g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d210g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60d26064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2f732916213d49b646df5940530fe86fe443e07ca2bbc5f57ba91d5f33adfe7a",
+                        "s" : "0x54949af28a114ec7578c116c9ed4f1d633e7b33b8406e4f9435aa99b30696880",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d211g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d211g0v0Filler.json
new file mode 100644
index 000000000..8e4728eb0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d211g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d211g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60d36064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1e78cc1a914e1f7101fca71e665bf2b7fd74f7a6d5e2732de0a767bb4d144697",
+                        "s" : "0x2e89aea1214526be36e7377077cd3c6c99c7dc1f5e6e4a561315a0dfaf4d4cf2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d212g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d212g0v0Filler.json
new file mode 100644
index 000000000..9d63d1bcd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d212g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d212g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60d46064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdf53e86ecc329ec172d35736a696b125205818c609317e43b99cc808218ab8b4",
+                        "s" : "0x5ea291542f2c9d7092b216cb53c56cce5d2a2225ada8d8f5dd2eb5e7f1016b6a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d213g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d213g0v0Filler.json
new file mode 100644
index 000000000..f4ed5835b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d213g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d213g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60d56064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5eb64c05d796b92780580b8a361f86e22477c31e1df7c490f38688a7dee943fa",
+                        "s" : "0x5282630272f49335e2b6c62fa42cf46f69e1b66f9d529bb03fec851cb3ea6fce",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d214g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d214g0v0Filler.json
new file mode 100644
index 000000000..1b4da131e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d214g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d214g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60d66064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1a08c640049d9eb6e3ffca1b4db6fc421465216c4f1a7a9e9120700ff1d7c12b",
+                        "s" : "0x45229d20a51ead52fffb72ec04b6294b786b07fc9fbf54ed280037147c7c491d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d215g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d215g0v0Filler.json
new file mode 100644
index 000000000..84161bd82
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d215g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d215g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60d76064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x851dd7bc8812e91045345ed05f7c47de0336d3b81acb3aed8e1193d81b3e70b0",
+                        "s" : "0x313767a898f59916beb0eb66a41d0f350b58b8f654ab03494a409ac4da78aa44",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d216g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d216g0v0Filler.json
new file mode 100644
index 000000000..8f437819c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d216g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d216g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60d86064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0b647d336d4905fb1238480181a0696dd9e623f2f5f661b6e990445fd24632c1",
+                        "s" : "0x50680db18a3321c5bab5f71441937e7c10c4b0e727c6405f072540b38170c6db",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d217g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d217g0v0Filler.json
new file mode 100644
index 000000000..2b5caec00
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d217g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d217g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60d96064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x39f22e77baa8a97e6629e780196ab053e53bf636c540c1701bfa7650ebced02d",
+                        "s" : "0x197798f68e45c31d2638a0df361d1394327b55350b72b78089adb27f369675d4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d218g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d218g0v0Filler.json
new file mode 100644
index 000000000..7c8f82cee
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d218g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d218g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60da6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4871b1fe1ac668a5deacafa11703d9e94b8c767d5770897cc1507625c76e7a78",
+                        "s" : "0x67591f25cb7f5496aaa52bacd1b8ba5834c677f1c6fa817a0de589c52b5e7b60",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d219g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d219g0v0Filler.json
new file mode 100644
index 000000000..0756066ee
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d219g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d219g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60db6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xedf8c0c1b036343eaf30c61d85e1026687c96fffe036d3f49c3b0920a780eeab",
+                        "s" : "0x3c560bd9ba39e675ad6cdb04f406bb069367522c3eaaac6a1eecdbc0f9fc74a5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d21g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d21g0v0Filler.json
new file mode 100644
index 000000000..da7e495be
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d21g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d21g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60156064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x61603405fe2deb5efd1f24b4a158119afc3bfe954fbc2245510941dd541b7bc1",
+                        "s" : "0x69b0085eece1055abc29973cedaef59298f20067d736f00cf198d3d292946544",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d220g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d220g0v0Filler.json
new file mode 100644
index 000000000..053ffe090
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d220g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d220g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60dc6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2e3fd0da60c4ee42e370ac4cca0adec4c15be7dbad38f571e2b96ee89801e03c",
+                        "s" : "0x2b76b059b5b06510061a67c7e421d32e478aa5f7cbe7d221246597fa6db97370",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d221g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d221g0v0Filler.json
new file mode 100644
index 000000000..b3f627572
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d221g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d221g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60dd6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc072f5c0624a07b826cb2d599dc8969fbb4b3ca8499d25824dbf6fbbe0c6dbec",
+                        "s" : "0x77c01b8b8048a737f0b19299f1e449e7fc4b00392d1c6b72f58d2aece51b4afb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d222g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d222g0v0Filler.json
new file mode 100644
index 000000000..a9f793c5f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d222g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d222g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60de6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6aaf59ff2f528ee81f6274e9e7aba6ad2a550faa8708623d439986861ce4197a",
+                        "s" : "0x160b8b85a5ac303b3d79ad4b1d1f5c96ade9a53e6464ec9fa22bfd17717283a1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d223g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d223g0v0Filler.json
new file mode 100644
index 000000000..0b2f23e28
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d223g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d223g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60df6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe115fa951bd930e2df550eb121747d12e1c0cedd3452325bc2a0047c622c6c63",
+                        "s" : "0x64e4b4b4c5e6c87bb49e5914cd2031ee595d9e11e2e8faac3dfe9f369b57145d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d224g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d224g0v0Filler.json
new file mode 100644
index 000000000..1ac388bbe
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d224g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d224g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60e06064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7f62a9b904e8efa69896e075e5b644df894c9d62f71b2f918ca1a4ce3098a6b4",
+                        "s" : "0x1fb6d229bd6a0578f0e011bccd18b6fe09e3722eeb9d7654c40f1fa3f3c7b878",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d225g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d225g0v0Filler.json
new file mode 100644
index 000000000..411f78cbe
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d225g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d225g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60e16064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x94fdadaff8597846d836359737c561ce1e331d872e9bdc9d539228069977ab2d",
+                        "s" : "0x1cb6d234d5b75753cef22f2cb04178f12207a8babc3174a0a53f7a383428799c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d226g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d226g0v0Filler.json
new file mode 100644
index 000000000..916fc785d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d226g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d226g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60e26064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf94fb5f872abad44b435783ac52d64590e45479af2d1093135463013c747aed1",
+                        "s" : "0x7facd70f014decfb1b18ed6f20ac4053e3c4a72409ef77032b4d7f46a9227f67",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d227g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d227g0v0Filler.json
new file mode 100644
index 000000000..32399ce0d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d227g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d227g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60e36064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfecba406f42df9f39be8dc40c8b91a1ac02b345debb6b93c6fabcd872733fba3",
+                        "s" : "0x5860528774f447602f04be866a087b7d285f5d53b70fd9852457eb50213a791f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d228g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d228g0v0Filler.json
new file mode 100644
index 000000000..f79c67b1d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d228g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d228g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60e46064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xecee763dd91275eba2528fc10659148db6d0b5bbb763c1c69c97f131f2805fe4",
+                        "s" : "0x5eab8de2113f6721666877e41cf269c8a77bc66173833b5ed4dde12473d3ddc2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d229g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d229g0v0Filler.json
new file mode 100644
index 000000000..703983c48
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d229g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d229g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60e56064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd9a795775919428b779df6877bae69fcdf1457b4add800a7b33b88d5b68fa7f2",
+                        "s" : "0x0df8f748936cbf475de9f34f5ff574bf25fa5cca1ba405be8835907a9d0f0d0d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d22g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d22g0v0Filler.json
new file mode 100644
index 000000000..db254987e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d22g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d22g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60166064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbb5c0aa328a2cbccfd0682847755c0b418b37c171203fbfdce812231ab7d9008",
+                        "s" : "0x4a47cbc766754fd002174a85e91a308d8787a0ff91c803ffa59e0b04c33a3b24",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d230g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d230g0v0Filler.json
new file mode 100644
index 000000000..d2cd93eb9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d230g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d230g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60e66064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcae8fc9575c25e611aaf976dcb6493025fbd2ce7e5af56c2fd553a43fb1171a1",
+                        "s" : "0x55c7caae7ab308083aa97b59a8a23414e26368cb4eb74d9162ce4b9289e95db5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d231g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d231g0v0Filler.json
new file mode 100644
index 000000000..365c6295d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d231g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d231g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60e76064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc0d6f14636497b225a98acd30b969327c717a0ee60944a026012f87507e66a2c",
+                        "s" : "0x1612693d9f5b59474bce820ac32b2352ec2aaf6af22b0310015223a762158909",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d232g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d232g0v0Filler.json
new file mode 100644
index 000000000..d975344c2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d232g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d232g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60e86064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x207b917391ce32298dabf44c12394566ab87f2a3526fc90ac61f1aca1b3a79f5",
+                        "s" : "0x28ec4b39bac9b0bb7654144daf4467d8ed90f7596e5bcf7100d59f72f3bb4744",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d233g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d233g0v0Filler.json
new file mode 100644
index 000000000..c2621ba34
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d233g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d233g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60e96064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x20c95d2e2af8a3afacfb0508cb030dbe4a091cd3a78ef2965528e2614716a749",
+                        "s" : "0x5b5f9abee9fbd89ea0451d09cbf62c4aa29b6076afcaf9d8b88b7a2039148ebb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d234g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d234g0v0Filler.json
new file mode 100644
index 000000000..e3a27506c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d234g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d234g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ea6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x587d8df37d7c50a5490c46ac0d879ab4ca05fa6d977d8d8f0eadefb710197b32",
+                        "s" : "0x2dd9b331bca67a9160af9954451f5e761dc5632767b4593feb25a60e1ae083cb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d235g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d235g0v0Filler.json
new file mode 100644
index 000000000..1302e70ea
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d235g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d235g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60eb6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa63379f2b0f2601461de1488cb7f9fe12f84cf28fa5514287cd770684c32470e",
+                        "s" : "0x2ff065221b9697f203484265a6674b1613a05936dc849662e11dbfe8a4e7461d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d236g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d236g0v0Filler.json
new file mode 100644
index 000000000..d47e5a9b9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d236g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d236g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ec6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbf7c84b3b55c63d30800da337992a2f543389dea19bbcc37aa41a6d929b576d2",
+                        "s" : "0x27630d2db85cbbfb8005bcc356c2b8afe290d02d34656bea5cb9d679b706c19c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d237g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d237g0v0Filler.json
new file mode 100644
index 000000000..865d20880
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d237g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d237g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ed6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9185fd60400ac64835f5b52c73f282ff004cc03c6415d3f204ccbcfd1d1687df",
+                        "s" : "0x104b014b841f710cb1e125301b8eef88e84b417f7c5fc3a4849d2b242819f7f4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d238g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d238g0v0Filler.json
new file mode 100644
index 000000000..de3fde1a5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d238g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d238g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ee6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0fe75e34a98ef91ecbccf499d690babbbcc3fef964b3216e016f830b7b85c941",
+                        "s" : "0x20f2eeae01b5ec786ac5c21541e3187bc1d6c0b0b2424c2b87eaacb7d7fec838",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d239g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d239g0v0Filler.json
new file mode 100644
index 000000000..fc4cfa179
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d239g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d239g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ef6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9cf6e64d62aa0322513d614e26aa20868f874163a67401171a6c29c5dba421a2",
+                        "s" : "0x148fbe7d5ecd4f9bf85417e57820a16b45f4c30f24303c81464c8387d8c0678d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d23g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d23g0v0Filler.json
new file mode 100644
index 000000000..49e2fad77
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d23g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d23g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60176064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x522ad62714472421e4710dfc2a757bebaf46c13da75e4ba9e2ecee708909e4e6",
+                        "s" : "0x4ce95f03b1455dd3fa84e86d2e1ae9c63f3cd2ade3dcb240ecd28570efb629cd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d240g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d240g0v0Filler.json
new file mode 100644
index 000000000..d09476bbe
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d240g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d240g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60f06064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x627a7ed2988c52145bfbc30ec1b1730826d33fbbfd92915a14174eb657321084",
+                        "s" : "0x629cdf339155a7284407029f9c17c361a9dab213ecf5b55bb1c3d477b86d5423",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d241g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d241g0v0Filler.json
new file mode 100644
index 000000000..5e46f90f6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d241g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d241g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60f16064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe66ea8675907a4bd6dfe9e092037f5df5fe6cebb1b265bda41a1b40d60e7a28f",
+                        "s" : "0x2637e45403d387b85a50d4090ccf3fd1e0995e44edd482131ff47cffed80b348",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d242g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d242g0v0Filler.json
new file mode 100644
index 000000000..aa3ca1554
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d242g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d242g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60f26064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1c03b265c57431bf1a4b288f1af07aa50d5350c052476efdfb0e997b572f31a5",
+                        "s" : "0x6e4b63f3a2a5692f9fb7e43468cc07ae4f4380a41f313d8a86518a5d056b6fb5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d243g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d243g0v0Filler.json
new file mode 100644
index 000000000..71694b129
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d243g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d243g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60f36064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x676275ca9b7595dab485c5f55c58925044486d87e8ab2ae522f1685cf5bd074e",
+                        "s" : "0x7ec08af266615c49b93a06ac33e34e4e898e0730791d5923963ddfeab6abfb6b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d244g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d244g0v0Filler.json
new file mode 100644
index 000000000..b0ab9e856
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d244g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d244g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60f46064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x54ecfbe5612b18d0222e59c8f38b342c7227d1591505c91958258355589c144b",
+                        "s" : "0x7a2ff38c483fb28bd8605f8d8753b146685163e2993d48adfa204f723f30485d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d245g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d245g0v0Filler.json
new file mode 100644
index 000000000..7254aa639
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d245g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d245g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60f56064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc67991d06e87735063ac2bd7aba390d806dafe13af8e6d9a175e9bb057778474",
+                        "s" : "0x5304ddac71af4bb590d9e31b6a9ec895b771614a1862ddd2dea0794acb09ffa5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d246g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d246g0v0Filler.json
new file mode 100644
index 000000000..f6431c037
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d246g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d246g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60f66064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf6b8d5bc3c18b81a211ff29230694a86dfe36a71a8e9bd3f1ee70be57edceb3d",
+                        "s" : "0x4b0f5759a47068d22bea852607a7f3c9d55f383b2a5d118279279a2393c679cd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d247g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d247g0v0Filler.json
new file mode 100644
index 000000000..3b1c05910
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d247g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d247g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60f76064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x11ef1fd0f97f19fd81605ea0492b531d3323b6c3926813130c42c57d3cb6c788",
+                        "s" : "0x46cc6d3ec3baa29fd833aedd375d99efe6f4a003be55943cb1c9777ab0f8e85a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d248g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d248g0v0Filler.json
new file mode 100644
index 000000000..b0ffd5944
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d248g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d248g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60f86064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3cdd6a50b930ae2972eab942b0ddf82ad5ad7110827248c2183a0c657f0d2ea4",
+                        "s" : "0x12b70edf5e01b210584bed9f945d76d1199005b65ab3885a7c51916732629854",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d249g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d249g0v0Filler.json
new file mode 100644
index 000000000..eead3effe
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d249g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d249g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60f96064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x021e92bb240a1f3003c5d6d14f09b9b8d03f4a688edd473f5f61deb38c82b368",
+                        "s" : "0x7a766e780025513a9a86ed94fba18872711eb37f89f28d1ebfc4b1e72e4b736c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d24g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d24g0v0Filler.json
new file mode 100644
index 000000000..0903173df
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d24g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d24g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60186064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x22652a60ada5c0a27506ef063c18504ac7496dea6e5664f899c5222abb545e8b",
+                        "s" : "0x5c93dbee23287fd546fa6413d8ec7447a15e8a72a1e655ea1ee838e66ae454ae",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d250g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d250g0v0Filler.json
new file mode 100644
index 000000000..f86d32849
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d250g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d250g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60fa6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5d1273bdd59cab271c0988bd4fda9809b99b42914eff48ac9f0d83b1d542a434",
+                        "s" : "0x21589f88529ff22789bf823d00999048f9b5fab8593b942f86351a2b6a6adec4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d251g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d251g0v0Filler.json
new file mode 100644
index 000000000..23bfa399b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d251g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d251g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60fb6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbee66e94c2540b0cdd6da36d2e3a51044f60b012faa9a1cb900956825e4627a9",
+                        "s" : "0x76abca4713caf69dd7700f7ab1b2f03866dbe6118ac3aedd1677a66a14674cab",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d252g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d252g0v0Filler.json
new file mode 100644
index 000000000..3d15d078b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d252g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d252g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60fc6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa83f19891d5bc6389629bbaf5e81c9188a9c0f283b4fb23a311aaa41fb1ba053",
+                        "s" : "0x5365c48ccef76345b413a0c7ee6502dc54fc4ab69e713be8070e2bd7002c04bd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d253g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d253g0v0Filler.json
new file mode 100644
index 000000000..5007848c2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d253g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d253g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60fd6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x52e8b584c577e6ac7fb76c864c10056921d3c00507b693778a1cf7201a9d0e5a",
+                        "s" : "0x3983dbe4645240808821c934cb25ecf9121e31f5599f8c30565bcf6d843f6909",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d254g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d254g0v0Filler.json
new file mode 100644
index 000000000..d9108f130
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d254g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d254g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60fe6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3f56fd43f1e5afd9c8a4ce5ae25bc674c0018d5cc974b8929075d0755cc26fde",
+                        "s" : "0x4da16cee074adfeb2d85c7d667104e16c941c06691b17b807328d5e99f38785f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d255g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d255g0v0Filler.json
new file mode 100644
index 000000000..fe8ee9d59
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d255g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d255g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ff6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfcda0dc0e0d474250ff101fe3e94f878a8e27eedf976d772a33ddf061c834273",
+                        "s" : "0x6dcf5b1df4549041edd7c49b16d3cbceeb4cf7125ffac6dc5a83a6d9c81d8d3c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d256g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d256g0v0Filler.json
new file mode 100644
index 000000000..ae0409b41
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d256g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d256g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101006064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x25ba9b482e2d498380919ce564234ccaf45b0c0e3d957b720fe3689a1ec8bad1",
+                        "s" : "0x09846fe7c362979f772eb4b8016f545b814437c66f49d754498a1b282506372b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d257g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d257g0v0Filler.json
new file mode 100644
index 000000000..8182fed24
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d257g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d257g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101016064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4a401d0033a75eb091308407f677a16de02dc09c98bee681a95f117c43c10601",
+                        "s" : "0x45d4e3f70db00c32afc7acb2bdc416b1945ced7aac6b21eb09cd9a4e3ba035aa",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d258g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d258g0v0Filler.json
new file mode 100644
index 000000000..6893d1233
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d258g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d258g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101026064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x180b68eee4e26952e18779da5b5259cea3405ca994629282cb276bfa7e8248ea",
+                        "s" : "0x1e88e120abc8bcdb6907f29166d52bb16fcbae2be61e72e34a4f4510a63e6a4a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d259g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d259g0v0Filler.json
new file mode 100644
index 000000000..d323447be
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d259g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d259g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101036064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdc4d7016a075d49196b8f6143f7cd898a572fbeb2d3b910e4754d672d14b0e5d",
+                        "s" : "0x5c4f440206d5afc202b5140f5e1e5850b2fe0862486e3f6baf9ea4b7d4d8e1d4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d25g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d25g0v0Filler.json
new file mode 100644
index 000000000..0b3536bc8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d25g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d25g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60196064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc30d44f1910b4e3c93bc450aee3e4edf799536ccedbcd2e6f2341141cce1868c",
+                        "s" : "0x086afa3c5b5b8da561aa51d332ae781490105c7574dfd354086bc70d156b585f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d260g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d260g0v0Filler.json
new file mode 100644
index 000000000..aa65106c1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d260g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d260g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101046064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0d7c587ef28dd706e58a93da0f730a2687368af60c152f9a2daf0a5b4442b35a",
+                        "s" : "0x4307987ec6b3b677239a9eb5efd260fa6f571db9ff9df3c26ca44cc3dc7cdd81",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d261g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d261g0v0Filler.json
new file mode 100644
index 000000000..390f5b034
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d261g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d261g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101056064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf7ace6ecbaf6c57b4e7cb0d71ff3739a2256b50e585e89550af8421f93198a4b",
+                        "s" : "0x695605d940a137db3f126cc0b8cb36ae8c386b69c85b4658bd030abce4b215e3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d262g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d262g0v0Filler.json
new file mode 100644
index 000000000..c9b4c31ad
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d262g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d262g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101066064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x33921d7eea7c654bb945a8c60536f6aed7cfe530fe0971ba68be89d67a849e25",
+                        "s" : "0x690e7558652d25530c21652bf3cdb9ca89fd2a48a93d90381ad794512f002644",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d263g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d263g0v0Filler.json
new file mode 100644
index 000000000..ebe1d01ad
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d263g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d263g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101076064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6c9fe83c2880eae9f1ae7bc73d5cdb38bc02799ec761477a46d7476e1a87b823",
+                        "s" : "0x503d45f77a019134fa861989653578a35857f53a33d5b46648126fbbdf6d6091",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d264g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d264g0v0Filler.json
new file mode 100644
index 000000000..c6de08563
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d264g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d264g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101086064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x807831724ad5029d19c123df46f3cb1346f06ac0b44513eb05a08184c49534c0",
+                        "s" : "0x0d234d67e5441ce8df4dff3120d81f486a99aeef65391ad458b9c9cf45759411",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d265g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d265g0v0Filler.json
new file mode 100644
index 000000000..d56adec84
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d265g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d265g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101096064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7c3c70edef1e14ed2865a6d59ce365dbb92c979019a1fc8854b109d6cb1a0d97",
+                        "s" : "0x28e58b399115f5d1351c13d5b00d9b0f26b9bb79284734f8f2985c1ba998db1d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d266g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d266g0v0Filler.json
new file mode 100644
index 000000000..ee71433d3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d266g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d266g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61010a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcfa04d6c34e4cfc1aac470196f5484385521e4f123f4a55494e4b2adb61c0486",
+                        "s" : "0x3d1184c67209b45139068a18684329c541de27fee13db4ef4adf96fa30c8ca42",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d267g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d267g0v0Filler.json
new file mode 100644
index 000000000..44e9f115c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d267g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d267g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61010b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x44968383321e1ee309b1ec02aab19b0764b126fc2420327b48c9589d2c71923f",
+                        "s" : "0x481f7e0c7a0e1e4e3f3cc6e44b0dc9c88f96325283ee5fbf303856b709a3002e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d268g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d268g0v0Filler.json
new file mode 100644
index 000000000..91fc0416c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d268g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d268g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61010c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb5f9ae18c4d952fa10f19d738c1deadac461780045f70d7e6c866fa549ca145c",
+                        "s" : "0x3dfbe89efed2c8ac17d3380865cd0ba559d1be4e0b5d575d092cb723133024ea",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d269g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d269g0v0Filler.json
new file mode 100644
index 000000000..13ecc08b6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d269g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d269g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61010d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x19e9c8bbc743372eb00e1b29476b7a97841407fd101f34a8a40e026080c0d2e4",
+                        "s" : "0x732032cea10791d338f7370c76d31e46f5693efef9ff38ec424ebc621cefadd1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d26g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d26g0v0Filler.json
new file mode 100644
index 000000000..a7586ddf0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d26g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d26g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x601a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe166e4aff22736fe1c5b51cb5dc99114baa03453c51f61e1c43255568913785e",
+                        "s" : "0x1968d90068faef59017dfeb671b5675d3ffaf78218d1dc2aa999fb94a3e165c1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d270g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d270g0v0Filler.json
new file mode 100644
index 000000000..9592d3005
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d270g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d270g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61010e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcdbfdd475c634d64228352e0775b6a1f6d4cb88e89b98f9da71be662ac10e093",
+                        "s" : "0x621d77ab83ad376820b48ca4ddb99bf1d50d3d18a72376a1449135f14f2101d4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d271g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d271g0v0Filler.json
new file mode 100644
index 000000000..f25c9252a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d271g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d271g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61010f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x774a44f8cfa119672a987864a04f99966bd4e32de34e298c676e86f2e1a71b8f",
+                        "s" : "0x6455950309bb4be3dfdb86201611b266c7b89cbd4a41ad7d1284c307162153bc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d272g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d272g0v0Filler.json
new file mode 100644
index 000000000..ab97980fb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d272g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d272g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101106064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3d1fe069b140317b3817c26b5d4e74ad5a62d74652568fdd34ee15c89185d497",
+                        "s" : "0x62e6e1ae3c8c0b0ddec5887897a16dcb8a0038799a2c67a10193053f8b162061",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d273g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d273g0v0Filler.json
new file mode 100644
index 000000000..eea8e9d72
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d273g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d273g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101116064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9daafadcd03ea381632e7df235a0bd6e1410b66745777da042c361dd0d12f45e",
+                        "s" : "0x38680f194cd68d6623a76bbe8298c14e916be55795c3cd6f3d30ecb8b9693524",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d274g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d274g0v0Filler.json
new file mode 100644
index 000000000..80bd33e6d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d274g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d274g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101126064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb03fea14730969c10305bd5bf929f6b597cbea0eb85f2693b405e5def53a523b",
+                        "s" : "0x3c33e236d97d58004a9ac09c7d536b44279510dfd63fb060b823247c953a226d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d275g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d275g0v0Filler.json
new file mode 100644
index 000000000..704f1d577
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d275g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d275g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101136064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x194c13a30a58465188ee5b0e06d6c91d0876bac41bcfc1f06aed7b00952cc242",
+                        "s" : "0x5bd4c62abddfdc54084480642e66a2f49f448b95a35d4feb885d7325fca6ca61",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d276g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d276g0v0Filler.json
new file mode 100644
index 000000000..6848e67b6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d276g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d276g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101146064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6f51444b8a309dba446a16771f0be09e364f2419eada3be5dddd15bf9f6d0594",
+                        "s" : "0x7bfb95123537157fb9580259aa2458df0a715e6245647b82faa2a3534b3188ef",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d277g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d277g0v0Filler.json
new file mode 100644
index 000000000..cf570c14a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d277g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d277g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101156064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x710a345098caf0d8e7b36ea3ef91ee9120b71d08913c12ffb40f0de2bc1afd27",
+                        "s" : "0x527fe31baedfb354cf77dafebfb2cd42f09f41148f762e05c267e80e2c6420e4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d278g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d278g0v0Filler.json
new file mode 100644
index 000000000..9db0caf57
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d278g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d278g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101166064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa0be90f2b92ecd87115569adf3619ed3786916ef2838d8160ebacbe8c41519c2",
+                        "s" : "0x36da804a2bfb043a72ef8231a734cb134eda8480ab7923672c9fbde956f2eee0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d279g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d279g0v0Filler.json
new file mode 100644
index 000000000..472e9714d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d279g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d279g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101176064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x05003bf4eee7dca2345d62ae0fb83c3e437b962f5bad55ac5a3fcb2b7ce98c1a",
+                        "s" : "0x56f8271c661cebb9e7cd4657e024d6e2a1b7a153a894077e318be0451be814e2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d27g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d27g0v0Filler.json
new file mode 100644
index 000000000..6893d9b4f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d27g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d27g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x601b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x61b7a416d277b1f6afd1dca93165849e4cb1db92e43c352cc85396334bfeb69c",
+                        "s" : "0x76d661eff322ab18a62f20b80bc0053313efe5a5e90b09ade798c0c74baf4e9b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d280g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d280g0v0Filler.json
new file mode 100644
index 000000000..23d6447c9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d280g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d280g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101186064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd6de4bfbb1b69d4ed550c1255c20aae5637a3e060695fd794239a8a65cfc63d9",
+                        "s" : "0x06171d5447e13536164cc14d08c618d0c3fe72427cc9cab7745de07214028270",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d281g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d281g0v0Filler.json
new file mode 100644
index 000000000..873227fbd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d281g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d281g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101196064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x392dc61e5d28ba58f4b9127889cc9fcf1b1bec0a4d66aca81aedb6fcbbd27f95",
+                        "s" : "0x4dd2498d6720cd573087bb1aca10d34e9ec790409273a5cde5bbe61bec73b4d2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d282g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d282g0v0Filler.json
new file mode 100644
index 000000000..4bbec5503
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d282g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d282g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61011a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x538fbd8a30cdf2e15531e7acf5c9468f65aace45365aedfb0e4cfd632ab08e21",
+                        "s" : "0x184958cf70f78853c52c13b86c2fc27b3d88b1e7049bb0dd8a187ffee9bbc986",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d283g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d283g0v0Filler.json
new file mode 100644
index 000000000..ddcc0b893
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d283g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d283g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61011b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8c8bd206fa7205e5f6f3a5fdc54cdd267d82fff4cba6e269161702d6a4980b8e",
+                        "s" : "0x55c8c6e0e78b5dd5e21bd3de223198a3aedaab7177978fec3bb5540a394889e7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d284g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d284g0v0Filler.json
new file mode 100644
index 000000000..7a210f02a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d284g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d284g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61011c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9dcfe2e413fd32a5a285d5fff50bc0e8d8f4104661f8da78a1ed9727dd608402",
+                        "s" : "0x4e05b51365ae8baa70693615b47d0ec700bf80262985aa5a2c7bbf5c4423f9e1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d285g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d285g0v0Filler.json
new file mode 100644
index 000000000..80bc5dfe4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d285g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d285g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61011d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb7711f265e22ab6dcbbf0d96537c99d1e2ff3a14afb797b25383daffeb90b01f",
+                        "s" : "0x1da157320f1918f5450120cb4e9ffddcd7cd18c248004966bbd3cf2404f597df",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d286g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d286g0v0Filler.json
new file mode 100644
index 000000000..6746f54e5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d286g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d286g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61011e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5ecf884dd32004285d5b7cf2eaa1df3c2ae875db4004944b6649fba7d6e38a93",
+                        "s" : "0x7d6c474f18605e1196dc376a4d8da8d46e31566358034300ec7d8e549350ee22",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d287g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d287g0v0Filler.json
new file mode 100644
index 000000000..ef50bbf07
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d287g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d287g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61011f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe0d02b44a5843247d7d11db1d78ba8648908f6a1878570d687b140caac0b52ab",
+                        "s" : "0x156a3240c06dceb1e343f31b2773bd20570b5d4965907a2a2229e5cb5d95630b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d288g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d288g0v0Filler.json
new file mode 100644
index 000000000..9b4e17d27
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d288g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d288g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101206064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2b836589891d08ef2a6a4dee1b6eac9d2f66b337026565d65882caf76da0e837",
+                        "s" : "0x1978d2c92f95d79c9d46ec68bab178e13a6ed7c5b8f280289ea5d9cb327494d6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d289g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d289g0v0Filler.json
new file mode 100644
index 000000000..b9f427808
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d289g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d289g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101216064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7daacd168642a0f84a7e321663eb8a47c448cd6d4f88d9e5816e6aeeae76b394",
+                        "s" : "0x38aa26f8e508a0b55cef1382cd9f3140ab15af58be58290f94c64c78a036a2d5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d28g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d28g0v0Filler.json
new file mode 100644
index 000000000..b6d6f80f3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d28g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d28g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x601c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6056fea815ad3c58ef69d703bbfc74d6d6ce9a51dec95ffcc9ca39ea72be2cac",
+                        "s" : "0x52105b87a10b050e5afcb405660c7c7201ec97a91e3f577ae893a1f375e4385c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d290g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d290g0v0Filler.json
new file mode 100644
index 000000000..09b670640
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d290g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d290g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101226064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x41d31247afedfe9990e0e6f11385013bb6e22b7f0df3dcfc84b3af93655317a7",
+                        "s" : "0x08116cd281d4a892507ec3dbe0e83307dc6a5114174c053a8fc0b7860e5e7ee2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d291g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d291g0v0Filler.json
new file mode 100644
index 000000000..ff073d9da
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d291g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d291g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101236064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb630124513bd3cb821f50c271c1c6a65197528944e41e00b6250d9c02a09b209",
+                        "s" : "0x3e855746d0e1174909732100f989af0ee1708c77cde27e2a39df8d647aed95b4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d292g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d292g0v0Filler.json
new file mode 100644
index 000000000..9ca140b19
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d292g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d292g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101246064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd3804d85df7470ab9e71d939a807d3847f7d6ce809720c9b1f7f71fd18229f48",
+                        "s" : "0x3b0751429a9a99b12dac6b2929d6605d62ecc0525937620f232ec3d10d34013b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d293g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d293g0v0Filler.json
new file mode 100644
index 000000000..65b1e9680
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d293g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d293g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101256064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x77436c1d74479a8a56bc338c516729e8737662db17e528df806a8f64786dd8f6",
+                        "s" : "0x6e39e14baae2efc6668d618950c1f030277e482a8a8ea8d2928e44f09b1c92bf",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d294g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d294g0v0Filler.json
new file mode 100644
index 000000000..8b1a6ce20
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d294g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d294g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101266064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa09c91b77a98af92d303c95a95b3cc91a337b08521c4f094ff597854d3f61a15",
+                        "s" : "0x7911c1ce44d0144b9bd9ae180fef46e84d56c789788e3d1d9f7e3f51a761f4b4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d295g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d295g0v0Filler.json
new file mode 100644
index 000000000..971f6d7cd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d295g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d295g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101276064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb7ca4cb6591a5a9e4abdeb399a71af585a8482b81c56233c3e76cfd531976abf",
+                        "s" : "0x2f20d38bce2051bd5437d4ae9fa6d619760d4edf0cb187817b033c5f1d375589",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d296g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d296g0v0Filler.json
new file mode 100644
index 000000000..f5032fc94
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d296g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d296g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101286064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9790c324884e112051f2f4a9e480b42dadc7b3ebd8cb85951183c53911d01514",
+                        "s" : "0x2b557a26e77ea5e790496484b78a8330c4db3f8bf288bc3204a9f7ed3f112de2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d297g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d297g0v0Filler.json
new file mode 100644
index 000000000..d3c99de4b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d297g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d297g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101296064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1e79ee7054675a253f7e3ce15da0167b1b1434de569349ee8de6aeb264cc09f8",
+                        "s" : "0x2e0f0ebf8845204c06a4c95a49fe37200c580685946564abbe48e6ed68bdda22",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d298g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d298g0v0Filler.json
new file mode 100644
index 000000000..0ff9b0852
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d298g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d298g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61012a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd046565feedfa0078b4fffc1794b0bba1ea10643d0f09be4f0442fe95be6e12f",
+                        "s" : "0x4188f2353036385d0464d0ef504fd5826670a301e3886c3eb602b5f044ecd856",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d299g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d299g0v0Filler.json
new file mode 100644
index 000000000..d4a9a40bd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d299g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d299g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61012b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x616ba0d159783bb1d258deda4c611d7ef214c1b07f2524902ef04be3408d18bb",
+                        "s" : "0x1ab2f1efcd24fa82a64024f6ffcd906278c4a3ff61d5dda64830efe2cea16374",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d29g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d29g0v0Filler.json
new file mode 100644
index 000000000..b582bdf54
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d29g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d29g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x601d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x11118f4fd19bf58f533c9477b3be6b3beeac3c118675bf90153017ae198f72c3",
+                        "s" : "0x38da3d69ceca27d404dd28c6008bfd6d2884744201128dc7c859d95c676a4ddf",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d2g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d2g0v0Filler.json
new file mode 100644
index 000000000..bae89bc0f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d2g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d2g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60026064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2b9c3881f95bef5e10052522ce768dd9e80259843413b1f7e213999d51ed1c89",
+                        "s" : "0x793fbddb9ea5877c78d25336a02c146e91729de8b97c282b654062bf89e0cc87",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d300g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d300g0v0Filler.json
new file mode 100644
index 000000000..34ef5dbfc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d300g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d300g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61012c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4a84ada44a5d025733f0e174e52154d58727372bc02fc1c8b87981bc448f7e99",
+                        "s" : "0x64284429942f57837e739aa35311c0f0a1646a716714934cd38a878518018484",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d301g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d301g0v0Filler.json
new file mode 100644
index 000000000..cba6c140f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d301g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d301g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61012d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x212d28a9faac01832dae468ca21d65e2d63f83a81dc10dfdd16c5c65f4686f49",
+                        "s" : "0x2bbfe793eb4f4b58c7510b86faa3c5426bedd987e2cdfa13e4ed4996c8d31597",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d302g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d302g0v0Filler.json
new file mode 100644
index 000000000..b33cad653
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d302g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d302g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61012e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe9b92d2a3fabb874d67a3184b3db8e35cad6cb9400e7a7e39c1a23742aff72b9",
+                        "s" : "0x0b7c624f14e37fa1ddb756ffe1a84ba7678fe25004a9dcd5962cec710e5dbdf8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d303g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d303g0v0Filler.json
new file mode 100644
index 000000000..6cd333e76
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d303g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d303g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61012f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x23474a57d1c9eac119933b1bff850a0724bc6f570883f48de9f3ffb0c8142957",
+                        "s" : "0x1c52f47177785e118f7f9b2532f3c7b60593f013da86b551cad2f0b880e60ed9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d304g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d304g0v0Filler.json
new file mode 100644
index 000000000..ab986ec05
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d304g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d304g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101306064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x15a9316db48a47b630003ce8a6e6efdb3eddf84c46adbb57f9d9952d50a20cb9",
+                        "s" : "0x57c1c29e8d5dab0fecfdbb5b8f3ba0d9827b8b2f56bb0dd010c9a5e0a741bae3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d305g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d305g0v0Filler.json
new file mode 100644
index 000000000..47251d6cc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d305g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d305g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101316064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9b0ddeeaec8e9e240b4e0189cff4906b2fe16ebd3fd717053a1e346a01b88191",
+                        "s" : "0x1dd1eb0a3236046d08305a8dc33ea5caa2ed41ded39dc0a2b785aedd78adc685",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d306g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d306g0v0Filler.json
new file mode 100644
index 000000000..305ef819d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d306g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d306g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101326064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb0befb6d29ed9c1f24a2b49d311612cdc45a8c849635ac88f02ff33a0b2819a4",
+                        "s" : "0x2de3e662d38819ba798261682779d0b64b979a7e96b96e007390b9f880a1f263",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d307g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d307g0v0Filler.json
new file mode 100644
index 000000000..90084220a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d307g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d307g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101336064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3b51881e393c5df5fa1f59f269ed8e8796c9a96e3d599187283ed230c2fb4e63",
+                        "s" : "0x5d3da7229d01c873261f760961915edc7cd5065b131432a53b43dfa0cef6ce",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d308g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d308g0v0Filler.json
new file mode 100644
index 000000000..bce83d72c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d308g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d308g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101346064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x47d724dc5a1a65431f06897e712dadb44f8e324d8a9aa4c32330d9bb88c92462",
+                        "s" : "0x1ef4bf4d8274b755672797e91e288223e6ca33752c8d13f5ea1146e808999293",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d309g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d309g0v0Filler.json
new file mode 100644
index 000000000..5261ec0bc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d309g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d309g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101356064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd0ceba4b240dc081651578d7b5bfaa2ce7ac4aec42f984fa88683507c2314845",
+                        "s" : "0x6164a7e6b28c580b247d13891b527162464abfd156e7d59015515eb179ebb5aa",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d30g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d30g0v0Filler.json
new file mode 100644
index 000000000..320401408
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d30g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d30g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x601e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3f194af9fd45f7ac586ebcbee50661fc6a67339fec395cc237be235304c58043",
+                        "s" : "0x26bca75e26c0b56815f567c739dd6651afa976ef7f4837c70c897d88ca521571",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d310g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d310g0v0Filler.json
new file mode 100644
index 000000000..c8a290402
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d310g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d310g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101366064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x84589d96244522b103f5238597902ebd2d052994aa040f36751c6d6e486f5e0a",
+                        "s" : "0x2b5e76fedb5e3a981c4206c3eb3ff89f047e4f7e919e5624df25a717e356eaad",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d311g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d311g0v0Filler.json
new file mode 100644
index 000000000..2d308a8e3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d311g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d311g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101376064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x657df5908f6008a7bb6ce6b97f824991e36f7f65615dff0ba01015afa5151ee6",
+                        "s" : "0x31a91cc77e5260c64626cd060f3da6e4fbe59b3d4e797345e96ed243743604b4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d312g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d312g0v0Filler.json
new file mode 100644
index 000000000..82b8b5af5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d312g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d312g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101386064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb61dec58f8511ff30216a94614ecaf8e7da391da12df4163947edb7bc1f0c560",
+                        "s" : "0x0e8b7f4f1041cc88d1ab6cb18b6bc6afc8794dfa1e7b42684a3eec0c0eaeed78",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d313g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d313g0v0Filler.json
new file mode 100644
index 000000000..82f3870d3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d313g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d313g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101396064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4a137579dd010a60a966511fe67818d64667f82370e24f88b9a3fa2624ca5f96",
+                        "s" : "0x760512371efa142f540650348153e624ad474e4e6769aba62a672b8793344b4e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d314g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d314g0v0Filler.json
new file mode 100644
index 000000000..29b31fbad
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d314g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d314g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61013a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbb8da0a0c3f2be27d670dbccb814a9b7fbc157b43436b2d6e7e9c4be5a69c936",
+                        "s" : "0x49dbcca22c05c668896789514097b4ac2bcca3010fce88c0ebe2e7e9a6401c89",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d315g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d315g0v0Filler.json
new file mode 100644
index 000000000..67b17e1c0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d315g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d315g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61013b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcf561564f1272dbb3bea1ab7823f938b5b4b001e9d6e40a8e143289e2ac05bbe",
+                        "s" : "0x7854d516749dd7cc74127e1133cd5558777984aff899d6be4b4797b9f9abcf06",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d316g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d316g0v0Filler.json
new file mode 100644
index 000000000..929190efc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d316g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d316g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61013c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x66f8fe26b71ce81fe593bbc9809f2568b4fdc120b1e35aa3285caba4af34ab0c",
+                        "s" : "0x60f94493bdd475bcac96d42948c7d633e370622b8702b7fc75d09c5a6532db5d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d317g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d317g0v0Filler.json
new file mode 100644
index 000000000..370059537
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d317g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d317g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61013d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x45c7ca0189137c664fd86a0646efdcfe88b30b41b887c6608554ef2737326d50",
+                        "s" : "0x4b23c7a16c83e7e15325d26108a4f0573aa245362ac6b4c5c52ce07f5db61b57",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d318g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d318g0v0Filler.json
new file mode 100644
index 000000000..80410e713
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d318g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d318g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61013e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x72f95c4c8f011308016200afe89e4b64da50e4efc73a872c6306994f79b5ccfc",
+                        "s" : "0x3a5b2379489736c88b3f2531b8ce09590a1a08a71b225c6a436adefaab52c314",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d319g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d319g0v0Filler.json
new file mode 100644
index 000000000..db6ff6f6a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d319g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d319g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61013f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa1d0f957224d825e7e6caf8e2903444de77b83b9feadc8a72b6c4f39981edbc1",
+                        "s" : "0x74b5da17faf2b8a3110818fb5dbff7f3fa707409dea7e8bcdc4e9c32cf86b2d3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d31g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d31g0v0Filler.json
new file mode 100644
index 000000000..db9971656
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d31g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d31g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x601f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd79bb8e1b9e0d1aef236758de5d489ff5b29fc1f1f2d4d3419a2cc8f790e1fc9",
+                        "s" : "0x262b528c5698db6c2b7f9449e95c2c8965bd62fc6b98b870d574e6e4c08eb41b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d320g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d320g0v0Filler.json
new file mode 100644
index 000000000..83aca213e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d320g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d320g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101406064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb5c528c64a659e41125e3d7c936ad3da2a63134b94bdc19570243065ac3249c2",
+                        "s" : "0x04cfd3d4d8a1942d455edbc06fe13a22e394fc7e511143c18690bc6c4df75676",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d321g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d321g0v0Filler.json
new file mode 100644
index 000000000..fc1003d11
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d321g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d321g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101416064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x44af2cb3057b4262dc23429ff4b09d44380d664cfb50807038e80e4491178b2b",
+                        "s" : "0x57cddd53fdffd4be5b93319370d1c9578f85c44bf0987d01394802594c6daa81",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d322g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d322g0v0Filler.json
new file mode 100644
index 000000000..1b907ecfd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d322g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d322g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101426064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa5bb732fbb06fa20ecd70c536ef7aa3db245d69a13966bc60631f68bfc59787d",
+                        "s" : "0x218f38cce871e29fc85b075b8896f5c7e7f45903b79c218939d2848eb257790f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d323g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d323g0v0Filler.json
new file mode 100644
index 000000000..97d13bb4f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d323g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d323g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101436064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x06babc682d0dbefb9489a2b6e29d2c187d1cfa4af2925c59d2db3f8e879bec34",
+                        "s" : "0x77ae79fb664f77065e27392cace96f2d296197a1fdaaf7efc90ff1fc10bb18d1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d324g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d324g0v0Filler.json
new file mode 100644
index 000000000..d7e7a4e3d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d324g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d324g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101446064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x54da2dd968caf39754fd49d60fe1f6832212cab6caac0902cb51119f6c01e8f7",
+                        "s" : "0x74b377b4bfa727952588081d7e9064f7e69e5ac7758a929095327d67f40cf739",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d325g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d325g0v0Filler.json
new file mode 100644
index 000000000..c96dd1a50
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d325g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d325g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101456064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x401f2d004669f681464e1dcf6986d88d2bd96cdd7e0b34f49e62f9cd6fbe19c2",
+                        "s" : "0x0abeb16a91d6dd45346e70269916b5b3b831e49da1952469358547e9a2c91f9b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d326g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d326g0v0Filler.json
new file mode 100644
index 000000000..2904c4d69
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d326g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d326g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101466064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3a990966d8758033b74ffbfed3f16817b760bb3054f92019b6b682d82f80a3d2",
+                        "s" : "0x6365b267dfbc889c1ffe7c165bc515c1327239eabacc051a8ab1749c5030434e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d327g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d327g0v0Filler.json
new file mode 100644
index 000000000..4b3ff5006
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d327g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d327g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101476064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8a219109e1cd892e59f66976802e06bb3536babda64ebf126c1960fb9ef4d9b6",
+                        "s" : "0x103df6cc11291aacf3d134d46cb613d1e20c0181d3b09e9a31c39bebd538767b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d328g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d328g0v0Filler.json
new file mode 100644
index 000000000..72cbc7b50
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d328g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d328g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101486064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x23483a23e5606549acf4f64fb73503183a6281170231a69f7f64150248ea1bab",
+                        "s" : "0x3cc75c023dca2f05555450f86ad6f979f7a196d02659fffa442a1bea3a39fc20",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d329g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d329g0v0Filler.json
new file mode 100644
index 000000000..ee3d188c1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d329g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d329g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101496064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8937747391f322080229542e54e45f29060041e5425a7d0f9700f98ea26a5ba8",
+                        "s" : "0x4bab5dfe946ad1b996b1f4457ac1887e86cbb0cff2b8931afaa5e914dec83fa8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d32g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d32g0v0Filler.json
new file mode 100644
index 000000000..62a6686a2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d32g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d32g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60206064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6a6441757caa2db9026d73b25dd7d378e025b33764667c302194486ffb7bdb30",
+                        "s" : "0x0a19156edb5fa794703ec0efc68801512f85006b538988becc645255cf835f29",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d330g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d330g0v0Filler.json
new file mode 100644
index 000000000..882a9db94
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d330g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d330g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61014a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe4ef85ad815e2d8aea58328d4be66d3219fd7b39cdc184c61ccec60d67189687",
+                        "s" : "0x02c77bed9801c4490d3db9f8d5a97e634eda36ec6966a90c397485cb85fe0e67",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d331g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d331g0v0Filler.json
new file mode 100644
index 000000000..48a99dfe6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d331g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d331g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61014b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc987fcda40f21cbcf42193604a819186644f262df66e636afa695eeb34b94085",
+                        "s" : "0x41faf24724ca323b41abedeee74ba2ae906a1eaf1ed2a7ad43e437088b615038",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d332g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d332g0v0Filler.json
new file mode 100644
index 000000000..81a7bfa06
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d332g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d332g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61014c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb7db8bb4dfe1dd55b421f8cee5aa895c0077f5b978670e6a523fcea7007ed3a5",
+                        "s" : "0x13761a08fc1222804064c380a62fa4fb1b0c9da8b3237b377476fd4cc5604469",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d333g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d333g0v0Filler.json
new file mode 100644
index 000000000..4b9342fa5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d333g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d333g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61014d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe16f01840ea8bb9720925f992ef5fb03487aa2f39d960e4fa2d890bd0fe13fb5",
+                        "s" : "0x25ca741b0721a01dace1009226ec9f1adeb025b49f93ef720001612c0325d2ff",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d334g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d334g0v0Filler.json
new file mode 100644
index 000000000..3926ffefb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d334g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d334g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61014e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf95596a5e6f5486dc077038684e2852d59942cc3e26c8dfaa315573dff2a1c8a",
+                        "s" : "0x20d5c781df60f08a710d8c3f704f45c12345e891c31a599f81aa0a80a31b7f1b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d335g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d335g0v0Filler.json
new file mode 100644
index 000000000..d2b01ec95
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d335g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d335g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61014f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5703d261e23d55032e1b07b38f97937c920fbbc02bcccd646c0c7c4d0729116b",
+                        "s" : "0x2deb87ddc55626e2c37e07ef7968f4a891bfa4d1e116f0548dcfa0666dc94c43",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d336g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d336g0v0Filler.json
new file mode 100644
index 000000000..30084d382
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d336g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d336g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101506064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5d18c3bfbd72f3033083f73fc8cbafab16bc25566ba90ea6a31ce0fbc46caee2",
+                        "s" : "0x604bcc605c80e943cf48e1fde5e053a26a917bfab327eb4b6231cda82e3c34be",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d337g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d337g0v0Filler.json
new file mode 100644
index 000000000..d89765b23
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d337g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d337g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101516064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x814567eee5f356ba8139ee760f7c7640469ad5ee3c45625796286c4b75933dc0",
+                        "s" : "0x670a786222b3a1fa76f4256a16c607f5ecc1cf60a323b49b50633aa4737b1293",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d338g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d338g0v0Filler.json
new file mode 100644
index 000000000..f3ead2232
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d338g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d338g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101526064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x126c4c292a5198f6a0966079d0251e075c1fa06ed9a89b95037f96838a5a6438",
+                        "s" : "0x1db8ef6dcf304365ff9129c74688d70f2bed89be7a4c8a2ee0e87526960a61b4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d339g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d339g0v0Filler.json
new file mode 100644
index 000000000..84e4ca3af
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d339g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d339g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101536064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x457bc074c7bdf2454b4747e4d75bf9a8210b4de4a56c99c089024145163467c7",
+                        "s" : "0x53e7d6529c979d7cd89e9dcc9b443fe72f0f159a8396eaffdda09e02b0839ae2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d33g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d33g0v0Filler.json
new file mode 100644
index 000000000..4f62db2b9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d33g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d33g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60216064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x110bb52c080e8273ff50244c6e78c05d3cd7340acfac90a57de462dab9303e87",
+                        "s" : "0x5155faad8bb1697b0816d8005a10394787fce48149b8ee25220471b01e62dc77",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d340g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d340g0v0Filler.json
new file mode 100644
index 000000000..4fbcd754a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d340g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d340g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101546064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa7d426efefcae3f498d032a373f11980cf77dac10ab9658c273012c585997889",
+                        "s" : "0x653c456cf7f249bbe6f3a50ce1cfae2662307bbaaf3a5fead20289ac03cba411",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d341g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d341g0v0Filler.json
new file mode 100644
index 000000000..a8dc2f7d2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d341g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d341g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101556064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x86afc0961807b852e5e80245835be02ee70922f4868ba17a34200aaa797b9c2e",
+                        "s" : "0x0bb4dac14f143d87caf609498fd4550bad876ea352699c8790b9ab3ff333e692",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d342g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d342g0v0Filler.json
new file mode 100644
index 000000000..4dccaf7ed
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d342g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d342g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101566064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeb9308ea01369a0dcc7f162578b1875705ee24608a6825a89dd1403acaffc1b5",
+                        "s" : "0x740835a0f2b1db80fa5070e74c773a9edcbeab3ddbefaadc152f1a0aa49221a5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d343g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d343g0v0Filler.json
new file mode 100644
index 000000000..7eca771cf
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d343g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d343g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101576064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0d2d1e0da4e519f25013a0169a473975dc5f2300c530f22a45574f46a9226395",
+                        "s" : "0x1378d8843ebc8606f7f10c58234dd3e782f8405b010af6f4dc9911e6e527186e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d344g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d344g0v0Filler.json
new file mode 100644
index 000000000..28f06b2d2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d344g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d344g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101586064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfab122053080b76d11b61217ac11f9829601090457e6e0d31b87b423c4c162b2",
+                        "s" : "0x5be4f1f08b4cb2c2647bb12f9842cd16eb9435c84f85d96ec8743a77faa11c4d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d345g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d345g0v0Filler.json
new file mode 100644
index 000000000..2adc24a66
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d345g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d345g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101596064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc161ee1e7302bfee0c7806f75b1533dbf9e74acb111dcb1705afe8b4316b442b",
+                        "s" : "0x1608eb4a9e372d5046a90d21a9596e9726851a65b9dd411676ed15c9bcddb183",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d346g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d346g0v0Filler.json
new file mode 100644
index 000000000..4e9c15305
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d346g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d346g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61015a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x60cf447a899d7630e53f1aedd1ff04638bcbbd1ab5eb23910f59bfc7b69d5c5e",
+                        "s" : "0x7e5ee86660c6df07a0c41861b8777f1b8a3713fc6e8794151682652f4c0aba72",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d347g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d347g0v0Filler.json
new file mode 100644
index 000000000..40ee4a4ef
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d347g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d347g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61015b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2f9da46b952be1f9820a2b90c92d1ace539e85d13734aad54cd166cbbc4cdce2",
+                        "s" : "0x1b24cc81531f09afb9a3f72fb114984641c345ed3de63270fac6a49137f44ca2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d348g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d348g0v0Filler.json
new file mode 100644
index 000000000..1519da8fe
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d348g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d348g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61015c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x26b8ce2afeff9f99caa52df4b78fd54bafc9f712e2382ee384b78fce14e67c91",
+                        "s" : "0x4b93bc1571400d3f66b70becd07f610696a0ce469f271b43942583b7b71d7a22",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d349g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d349g0v0Filler.json
new file mode 100644
index 000000000..e17bbe0c4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d349g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d349g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61015d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xea9fcd16d2a62735dfe02e85342c1fe4c443f23115d47d6312205a70b83c0b32",
+                        "s" : "0x689f63264740ca58a207d3d014f8d4cfab066ac25048cafce60c60e851b23195",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d34g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d34g0v0Filler.json
new file mode 100644
index 000000000..ac576e24d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d34g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d34g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60226064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa2ccf8fdeef67dce4ab893d00660de05cbd936075b5c650b841db65f398359c4",
+                        "s" : "0x19cd7cb837712e902c29313a2e5105e802bd6e59eec624e56133d01e12144757",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d350g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d350g0v0Filler.json
new file mode 100644
index 000000000..073a63d21
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d350g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d350g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61015e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe3c42c4b0b16533ec61264bc8dc6c798e86a00223dc4e56dcc4697ae7c32bbe8",
+                        "s" : "0x01baf6e3d62f2244fdd4b100a9ed9640ec418673b213e23f0c4b4e5b00bf54f7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d351g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d351g0v0Filler.json
new file mode 100644
index 000000000..d5b7514cf
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d351g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d351g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61015f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb57613ba5e97385230aa21374969bee77772a7baaac42bf96d1975aaa503a46d",
+                        "s" : "0x4bb7b32703557f6df414af299b0fead2ecdda822d5087a3ebeedfd2a5d0743e9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d352g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d352g0v0Filler.json
new file mode 100644
index 000000000..caa527164
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d352g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d352g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101606064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7de93b883ec8d7e7a61dc280444e35fa213e4df99650ec126e6ad6ba85b99e92",
+                        "s" : "0x534b5f9990264f68ef8e114680611858008f1765e5e11cbcd361302fda09ee34",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d353g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d353g0v0Filler.json
new file mode 100644
index 000000000..9322a01db
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d353g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d353g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101616064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfa311c03678e17ef722624b8e8a356143ae897850c5949e5d3c71f2c5692df2c",
+                        "s" : "0x0acaf2a1adb2d5072e719e7d3496277920a9d18b0d8370a9320b2bc55774a9a4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d354g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d354g0v0Filler.json
new file mode 100644
index 000000000..39e0134e7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d354g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d354g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101626064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6a4268eb5c7fba0eca3c4f57f95c3a6829aff865d570fe9a2e1050aa03f537d3",
+                        "s" : "0x139fe5a4cae5d88d0b6c1e0a634e6e0e6bc4bb2a9f5eb55f25d419e97875cf62",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d355g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d355g0v0Filler.json
new file mode 100644
index 000000000..aa6625525
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d355g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d355g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101636064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x46b3add95c90cfb30a70685b625d6036cd3f364e9c62f28fdfa1514866da7d34",
+                        "s" : "0x585509ab5cb2dc5dddddaf09b9694632917ee7c4a94bdf1fb51719e9affaa7d3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d356g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d356g0v0Filler.json
new file mode 100644
index 000000000..2ba6ceaf1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d356g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d356g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101646064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5ff95d76a07d6b73aaf5a266f9972628c4a50e2c138d9111747b031896ba4a87",
+                        "s" : "0x78d83ff571faaf8274d9fe178b7fbea9bcee52caae8163d3823be4f6d0dacea0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d357g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d357g0v0Filler.json
new file mode 100644
index 000000000..97e46ab98
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d357g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d357g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101656064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd3dce26d7e5de88ea006f7d826ceec567bfbc0f871d557507fc7c2f7e215226b",
+                        "s" : "0x7da2be02a6984dcfc538c3aa13a559e8312355783e557e12ea049e29e385c6c3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d358g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d358g0v0Filler.json
new file mode 100644
index 000000000..1c96ef02e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d358g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d358g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101666064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x29827e1657ac4b093e7742a645117cb3a2563d5778485fce8fc2f21255026e15",
+                        "s" : "0x21c8fbc3f3d605800bcb4c5e541fcdc03c8b95b57116c45f5b3c84bc340523fa",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d359g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d359g0v0Filler.json
new file mode 100644
index 000000000..accd9c6ed
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d359g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d359g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101676064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x78beba2d3c06320b0953ecbd9ad5564a2bec31bd641fa883116db3a68d9067ab",
+                        "s" : "0x4dca841fd60c98a187fc4a6faa5bad7e7d993836c3ffb23a93ff896227f130ea",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d35g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d35g0v0Filler.json
new file mode 100644
index 000000000..052971933
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d35g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d35g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60236064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x03ad2adad092e104be44482bb18666eb8652e0021ca5665daf3c1e77e1dd36c6",
+                        "s" : "0x62ab77d4804e92107fb6e71d9809e7954e13e0f77d691a89575b13ac26efd2a0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d360g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d360g0v0Filler.json
new file mode 100644
index 000000000..371c98502
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d360g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d360g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101686064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xef44050fc5c10e90a5027668abd78df1c41e0a72d8be59177244d9f6c4fd8018",
+                        "s" : "0x68eb733c0261cbcd8b4b379b2d2c128b88e847c83fe5ee54a7d2f05b86d19c80",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d361g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d361g0v0Filler.json
new file mode 100644
index 000000000..1be9aebf2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d361g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d361g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101696064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa921ad4ede3b0e393845fecfe094a714b26da302e71a7b88b5bd55a8cc1cb4a8",
+                        "s" : "0x1e0ddfeb7dfe3c2a72dc2b60c4537d2c547fb572e3a36a25471c77612b3d93b4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d362g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d362g0v0Filler.json
new file mode 100644
index 000000000..f2445a174
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d362g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d362g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61016a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9a551e4d86585e0b2dda814fea91bc6534d44f4545455cc5e110563e1f9fe2b6",
+                        "s" : "0x4cf98e2523c04b8493100a119c25537003eac71d9c4160ed0c56c79e0dc30316",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d363g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d363g0v0Filler.json
new file mode 100644
index 000000000..fa26ef8a7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d363g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d363g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61016b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4126e0250063dc7d33ad1de95f7a2080df760f122bc20b8fa7d1f7c8d7032507",
+                        "s" : "0x4dce4be822f47d9cc0701e8698a77616081f8c560f57477e9ba4b7caf52c4e9f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d364g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d364g0v0Filler.json
new file mode 100644
index 000000000..e17bff816
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d364g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d364g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61016c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x416d3fbde754446ea257301e336a676c1e6d890d5d47e6df1391a137fa62c58d",
+                        "s" : "0x52c636522b670519169f417f7a21161793efafa4cffe9ac5eeab17188a6db5e3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d365g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d365g0v0Filler.json
new file mode 100644
index 000000000..97d2c1bfb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d365g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d365g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61016d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe56e561113bc8426b1010e2d23d54fdb5852214c1caf49786f42e2d9d39611c3",
+                        "s" : "0x45161d4d5f896520aeff693d9aed159dd911b2e589861d8dc458d9173e96d787",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d366g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d366g0v0Filler.json
new file mode 100644
index 000000000..ad5134d35
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d366g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d366g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61016e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8481840e195b7c29560eb116444fb180c60ebb5ca2dfbdb13bfed6fcb2f32df6",
+                        "s" : "0x3d87489f172877369760b7f332812903813601c95d78069e8d880f03ff1f7d39",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d367g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d367g0v0Filler.json
new file mode 100644
index 000000000..15ca7464a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d367g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d367g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61016f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82e9ebf11ca0ddfc402b6738977ef0326714f705abfd7122e459b12a4b289b8e",
+                        "s" : "0x6e9615f5c6dd78325058161b66b7bbfeea8f1b760f83f2bdf71ea45ec810dd26",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d368g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d368g0v0Filler.json
new file mode 100644
index 000000000..fb3802075
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d368g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d368g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101706064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe6f39cdad286192371be7d0c99c4eb0d82011e2faa5f69a103a3a7500a1d5cb0",
+                        "s" : "0x66af78dca5e4595c1ec6c6679e568b9ae92b0a941b71b5a6e145a7f76a4f3ac4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d369g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d369g0v0Filler.json
new file mode 100644
index 000000000..02b826db7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d369g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d369g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101716064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8250b4c467a65ea1bd1f8e594faff5f22a99c1e917392406193fc5f883a66f05",
+                        "s" : "0x7e2509dcc1ae135d64be4ecdfe7f4e7336531ee62692ad997e04ced968cf0fa2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d36g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d36g0v0Filler.json
new file mode 100644
index 000000000..acec3cf0a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d36g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d36g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60246064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf65ec1d4d806e54a5cebcf71d4f3889c764dd5f841c7bd6a235e88c911c86e46",
+                        "s" : "0x1b01930d0a5b71bc5f2a01e328f5cebc2140b1a27d5ba4a1c829673964eb62ed",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d370g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d370g0v0Filler.json
new file mode 100644
index 000000000..1276f6af0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d370g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d370g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101726064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x32738431517e0c8e97d838439543315c82370bbe36ae5cf1167aae7ba8380150",
+                        "s" : "0x0e371201e70c2203bfd485ed1dc080e329e8fcdaccd4fae07adb8ddd46694d1f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d371g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d371g0v0Filler.json
new file mode 100644
index 000000000..f5070bc09
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d371g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d371g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101736064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x798984207a412f3fceb140532d821fb5e6a09ff6fea782dd5c49e5646a2913b3",
+                        "s" : "0x5872aa120f528996f8570b257af28f88570c6c3482084ebb69e6b769f23d0243",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d372g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d372g0v0Filler.json
new file mode 100644
index 000000000..e503830c9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d372g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d372g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101746064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x22980a24e27c6810560529b84f21c236bf8c1f06b1875edef95ec20bf3328122",
+                        "s" : "0x11ad2230aa98c150f3f1619ee4a775eefb447a4275dbc923a0d055e5ddf8b442",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d373g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d373g0v0Filler.json
new file mode 100644
index 000000000..efc74f773
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d373g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d373g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101756064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb1b3910e1a541c67d21d44b5f5bca7d323153d9fe0b7f655337f2a8d63fa3c27",
+                        "s" : "0x292a4550e7f33afdf480882ad222571cf3c5cbe0e570d62864490e6c342ff33c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d374g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d374g0v0Filler.json
new file mode 100644
index 000000000..dc80d94e9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d374g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d374g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101766064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2114024ddd114356f6e7e07b84d8de6e983c4a7a54b8dd5db2b37bef80495844",
+                        "s" : "0x079c0c859416d3f8605ad71638b8e94fb21090cc75daeba99d5cad2c55213ab3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d375g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d375g0v0Filler.json
new file mode 100644
index 000000000..5afa089df
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d375g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d375g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101776064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7bad02320d03b175cdc90f6d8bbd39623643a983f6cd0767b650a4196551b386",
+                        "s" : "0x33019d3bd1d2867ed1c43a7a800e3bc45820b9a8839cc67f429be6d30c2e3aa8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d376g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d376g0v0Filler.json
new file mode 100644
index 000000000..4206ebbfd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d376g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d376g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101786064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x580eaffabc120d6b5ac4dbc6f76bfe2da8aa07ac04877b0bb1626224ab498376",
+                        "s" : "0x12ad5db1228b5d7e12468e4de54c24ef30fab30972cd48225a84e0f4e5a1cab6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d377g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d377g0v0Filler.json
new file mode 100644
index 000000000..ebda27232
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d377g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d377g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101796064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0948bd298c5ff5b29dd2bc7fcc98c5a65835c56e22475dbd1b39c00a733cb014",
+                        "s" : "0x226c8b498af26cbd0b24e4489e70108b2edf3432a96fefdbd043f5f97db563d6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d378g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d378g0v0Filler.json
new file mode 100644
index 000000000..e2b26bcd6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d378g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d378g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61017a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x862b39437ecea85ce221dbc74e4f272482f975ede8e48b50f9a37ff5cd477d56",
+                        "s" : "0x059ea705e2e9be3706ee51744a69538c241359971be1b0f3fa1b2e4e0021ad17",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d379g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d379g0v0Filler.json
new file mode 100644
index 000000000..61b43c11f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d379g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d379g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61017b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x48935460d0f6dac26011231643845d41b5b6e453b1ed87cce7cdb4cffba81459",
+                        "s" : "0x08ec3a1c7fbd42824aac34510e9fdbba7f738242b72129ed25bb20a24e890e6d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d37g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d37g0v0Filler.json
new file mode 100644
index 000000000..74ec03743
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d37g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d37g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60256064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe969c31dd02368e56b4d08e1c89cae4897e0c656e29db987c7e5d63c77182296",
+                        "s" : "0x6ea26c556f1eff8b67dd8c8f68b32e5a691d2195ae31273fb86611c342e21453",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d380g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d380g0v0Filler.json
new file mode 100644
index 000000000..9d1da4a8b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d380g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d380g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61017c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd03896b440d640f9fbf5cccc2bfbfa82df7265d6276e51fb23377d3c9559d5b0",
+                        "s" : "0x472fc0fff629f3e414cbf8fcbab93603a286bad1a23bd94887d09242fbd09456",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d381g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d381g0v0Filler.json
new file mode 100644
index 000000000..869e67641
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d381g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d381g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61017d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x52d3c1abeca8743c5759827508ed7fee0be717cd2aa73d8360cd654ef1fc53cd",
+                        "s" : "0x1a76bc746980619833b4aa9464ff5f14673de10a8a6044695b12165a602240f8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d382g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d382g0v0Filler.json
new file mode 100644
index 000000000..0251575f0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d382g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d382g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61017e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x55a9a28b0f194b4191beaedf2fdde5e7e4336859536bc4cb44a35f199605fa1c",
+                        "s" : "0x141ef6a190e854e04666a1b8781e5b318d90d6758a5a575bb6a96390144f4df2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d383g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d383g0v0Filler.json
new file mode 100644
index 000000000..6ab729da8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d383g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d383g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61017f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7e2d68700aa353d2033810273f4407582dd75c009b7f4fc1dec97593f63a8cbd",
+                        "s" : "0x7e54b41df581207e1d0b768909c1c9cce04df418bbb9a57d4d3644e0098e490e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d384g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d384g0v0Filler.json
new file mode 100644
index 000000000..24abd9e6b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d384g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d384g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101806064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6886128bd45fd0b930b00d94f38529b04eab80f7f84f5b4404c18f247a7723f7",
+                        "s" : "0x159ed6a28f17f54715c4a3bcb013893286da22e04cf958488f1c4774adaa9765",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d385g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d385g0v0Filler.json
new file mode 100644
index 000000000..6fb418b38
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d385g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d385g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101816064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf1bfb201fd952de73e8d580ceff72a8da9f957bba114056ef70bc0ff3d453368",
+                        "s" : "0x7bee2e3b2008dec867cc5a1210d6526607160304451b28c5e230bc88309ea685",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d386g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d386g0v0Filler.json
new file mode 100644
index 000000000..a5a9570da
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d386g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d386g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101826064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5cd6e968bbaa9c05f337be4c179354ab2ff0a61132d43138a3cec7b68a279b01",
+                        "s" : "0x4bb9c8d2f69c95aaecd9efb4dd880fa7885e3f3d493a4ac05484c033991a2b49",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d387g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d387g0v0Filler.json
new file mode 100644
index 000000000..db29e8351
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d387g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d387g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101836064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc6cdc65cefc49c55d02c4dd2ac871739fcdab377b7a9864a0ae0493aa383370e",
+                        "s" : "0x4c9228738be0f6358ab44c9d992c02e9e8c1d9acda99b42be7072c9cde2148b5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d388g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d388g0v0Filler.json
new file mode 100644
index 000000000..30f629539
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d388g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d388g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101846064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb033a6efe07e0b7b4618148aaaa16bc7314191626a83e68602603edeacc275d0",
+                        "s" : "0x78419609a0b61112db9f3c092d8dba7731b8966982a438eafdfb87b36e0701e1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d389g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d389g0v0Filler.json
new file mode 100644
index 000000000..0cdebeab0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d389g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d389g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101856064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6fad1c77771f2a82bd8e8fb2ad9b5ac92a28a2ae711f87c1535b7c790e1b56cf",
+                        "s" : "0x73469f32a6678972bb46a28d34acf5c372ef2204e5af06daf23a63d6724de668",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d38g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d38g0v0Filler.json
new file mode 100644
index 000000000..8df054269
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d38g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d38g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60266064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf790791727af3e426bd5d274d78eb11db09427494ae4822125aa9034ece0827f",
+                        "s" : "0x61166c01ffaa03af937a1dd85ca5fcbda36488954dbefd6808858e7a665e93f9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d390g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d390g0v0Filler.json
new file mode 100644
index 000000000..6547be2a8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d390g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d390g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101866064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5c7404c38abc06f25de749fc2c714b0cc4ee2c8cfc3c7257deddd729e5a7abf5",
+                        "s" : "0x43f985fc2bdc7bab28f9f3fe40f67f6c188046d4a98b5d59a70354716fcdeefa",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d391g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d391g0v0Filler.json
new file mode 100644
index 000000000..9821b36e3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d391g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d391g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101876064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe72b284e4f7f1c8362a8b1943de3266b1f6e5b2f33109f0f13e05b0534c50c53",
+                        "s" : "0x742fcc690391886e5a991126d5f241a84d2a131aef6eb3ae018acf9444409ddb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d392g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d392g0v0Filler.json
new file mode 100644
index 000000000..c38c0061d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d392g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d392g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101886064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe7ac42a9f22d98393f3a73e724a4bbc2492cabc2498ea79e512b5bcd672001b3",
+                        "s" : "0x734cbafc14ea3ee559357756e084acc7e254c7a10dcf969c1dd2630e647c1f04",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d393g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d393g0v0Filler.json
new file mode 100644
index 000000000..2e989af26
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d393g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d393g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101896064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x71603c1dda6e41d61eeec1b82ae159ca033e59b4abb00ca77a7df28a0aa17ce9",
+                        "s" : "0x6b56c5e63cf0d598dfeac8af398d94448e2d5638cc7d749322bd246e50b0f135",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d394g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d394g0v0Filler.json
new file mode 100644
index 000000000..ccbcab4d9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d394g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d394g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61018a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9777371c0b3e6ff051451ee8256dd14c4e71f8151b7250d5f621b3e3a5a556f0",
+                        "s" : "0x671b1f421db5d4609d5c9305a4bb23d5212e9fa9f1749a19279b275d1c5cbb12",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d395g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d395g0v0Filler.json
new file mode 100644
index 000000000..802ac943f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d395g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d395g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61018b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x49699833a835d57eed218518646f1c32a6ed41380bf52505bd12483fae5ce995",
+                        "s" : "0x3f0eda1d17ff1a51f056998a35e489b5a811ee8f96bfe5411b37b4bb80872953",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d396g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d396g0v0Filler.json
new file mode 100644
index 000000000..9668f88e9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d396g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d396g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61018c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82e0a2e9865932db613cbf7410747880f01b5006cb01f71df4f64408a97f6c38",
+                        "s" : "0x5f88aedf6be79794668c0d0daa57852d697ff44a99d453b87cae43e3c5bf7abb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d397g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d397g0v0Filler.json
new file mode 100644
index 000000000..4f70efb21
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d397g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d397g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61018d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc399cef44d2fcf164d967717ad0eaecafdcb59d75adae90f50f642ffdf81edac",
+                        "s" : "0x253fd2feed06cea5e5e5ca4e0b8a8579c3a3dcd12459101724bc14d8d8c02c28",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d398g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d398g0v0Filler.json
new file mode 100644
index 000000000..38cc78caa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d398g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d398g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61018e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xafcd1d5e1663f1c589bd649b64b4d58b4389bcf22bd001898689c1f8f5f7d1e4",
+                        "s" : "0x1983a2692ba47b822973deeda9dd4861747bc8114eacdbf31a41e70fa3810f77",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d399g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d399g0v0Filler.json
new file mode 100644
index 000000000..50cc376c5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d399g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d399g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61018f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4cdab30aff178868836b82e3f3d880f66a5347e91a57dbe4cc0a333d67298c67",
+                        "s" : "0x23dc78647c07a3758022ff869adf9541bfd57623b140a636d9f7fc3eac49040a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d39g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d39g0v0Filler.json
new file mode 100644
index 000000000..4c4e954d9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d39g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d39g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60276064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe7791a454f76a57f9cd48067899790387c977407bd7424d963f944d94d7cba4d",
+                        "s" : "0x3a5344ee0e6f36737741c5e71e9ac9a2fd5683bfb12d082ed59202200c9d393f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d3g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d3g0v0Filler.json
new file mode 100644
index 000000000..df4f7a68f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d3g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d3g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60036064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb2f053d4554c82639a50b9febeac8e1bf6480a232eab6425629b5ac8a67079c3",
+                        "s" : "0x7bcab90139fe99d7a395e9347801b99bc2965f415d1626a4731ff63e61fe8e2b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d400g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d400g0v0Filler.json
new file mode 100644
index 000000000..c25220326
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d400g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d400g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101906064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x513a1d06f3340cee35f8f9d3cd3c00f1b045b9c3020933c2aff140d4b4240a9a",
+                        "s" : "0x773dd0fee65c0993c75e65594a14415bbc01d333929d8f58cdf5755aee53dbc1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d401g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d401g0v0Filler.json
new file mode 100644
index 000000000..b82704c91
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d401g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d401g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101916064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc79aeb0ca76af1ec4da84d4cf58eaf6f4b557ed9893ab04d2b89e162f5935d98",
+                        "s" : "0x4acfd4ee40bc7da1abbe8ead21ac21caab5c06dcdef763bae9a406007c076d0b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d402g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d402g0v0Filler.json
new file mode 100644
index 000000000..b2374ad3e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d402g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d402g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101926064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf4ab7c060200d16ae86e5e65122b09f9abf51ab8efef868a52e01af9254e00a4",
+                        "s" : "0x2c2a2a56c3249fdda2ab650e80c039404792bfa461bdf130920694f2a50e68b1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d403g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d403g0v0Filler.json
new file mode 100644
index 000000000..8534088b6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d403g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d403g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101936064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8687d04d685dbba378699b42ddcd3c783a4e1b8ac801d15549e5e1dcca2e3732",
+                        "s" : "0x49627f262116a96ad86cebfc768e6b879cbc0a4387bef9ea2ffd9ca75ce6c293",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d404g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d404g0v0Filler.json
new file mode 100644
index 000000000..abdb90d67
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d404g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d404g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101946064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x37d93e59cded46038aef6ade04d46bc5b266e1279f5a0f5e704b9071657bd558",
+                        "s" : "0x399e8bf41880c3550c564456a422d3465c7912b1d0d393967f261cf036e73db1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d405g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d405g0v0Filler.json
new file mode 100644
index 000000000..b766849b5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d405g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d405g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101956064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2c44c3c62b7c0fc770aca09141631d6617bbe0894cb0fcbf90c252228fdcf177",
+                        "s" : "0x6409932d8dd707c8d54dbaa3c309da1d8697026e3236ccbefe1b603b41fddb45",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d406g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d406g0v0Filler.json
new file mode 100644
index 000000000..eb1528f90
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d406g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d406g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101966064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2a6d457080e5f2030c022f4674a6246f3b268c1fccb3af90dc92dbc3c2dfcb62",
+                        "s" : "0x4e0c0deb000279da329ca9e88773545b9524632699b0f8b0c4ec4298242bacc8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d407g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d407g0v0Filler.json
new file mode 100644
index 000000000..255836fbb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d407g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d407g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101976064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x062271675f888ff9509c0296ee0763edea83981dd1faab52bd5eb0e9e63c286d",
+                        "s" : "0x19e57376d8073797c0fbf198ad2e99a3602abd4ebc0125657dde3fb1da833e7d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d408g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d408g0v0Filler.json
new file mode 100644
index 000000000..fc9ae44f7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d408g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d408g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101986064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x03723a4bcf26d3c2bc6249ea56a1277d7c54d10b888ceb2994d74c48138fa5f8",
+                        "s" : "0x75f83a8e964fc99fe07d7f3499e4b545217a8a64334cabc471494176832a1053",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d409g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d409g0v0Filler.json
new file mode 100644
index 000000000..246a2d59f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d409g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d409g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101996064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x660572e07fd24d2edbc6de3724c2c57ae1f423c1322dfd6dc071c1c3f27462a8",
+                        "s" : "0x353fdcb6118be7be8bc5db81a91848a1a79c6d8635ac65a285fe3b12adeac949",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d40g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d40g0v0Filler.json
new file mode 100644
index 000000000..850dff120
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d40g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d40g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60286064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x740e11c913158fc2344b9468897d6dcc7c0df4998c0089574e63365152951ef7",
+                        "s" : "0x6c2835f2e8f4fd4c7152705b63ac34eae08a81e08076e758236281f0f075d102",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d410g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d410g0v0Filler.json
new file mode 100644
index 000000000..aed000a2c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d410g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d410g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61019a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x65a3d253dcbd3d0dc144e501dc9bae4aa0fc6bb72d01633c4f49f2c0b31251fc",
+                        "s" : "0x2810b5647dd442d11b1119b52f1cb4e112179f15eabcd9b4eea135884f5c4d5e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d411g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d411g0v0Filler.json
new file mode 100644
index 000000000..42ba4af62
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d411g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d411g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61019b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x549b9e4ca05f28ce45ad89d2461e3589e7c674948bb06670649e5189ee21ff5b",
+                        "s" : "0x76b299aba8bb7b07266ecba49d703214021dfd6b9c448b84edfb0c2ee7f5bdb9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d412g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d412g0v0Filler.json
new file mode 100644
index 000000000..e0a8a684e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d412g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d412g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61019c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6f37903061359ddee20d5ec9ec8f725c272bc4239b336b771a4ae5afedbc3527",
+                        "s" : "0x0315f7b6c87fc30de8ddda4d1b3482ed46ba9c14dcc2646a93e493a1be548270",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d413g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d413g0v0Filler.json
new file mode 100644
index 000000000..541b3f831
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d413g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d413g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61019d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x05eae1d53b0f9e9e217ffd53dbe3d51f60e0b0b160fc8c9ef168d05055a5265c",
+                        "s" : "0x779a035ee1e89a6ff3696543d76a2325cd80b06f814aa2428f541f01e9efbf6d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d414g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d414g0v0Filler.json
new file mode 100644
index 000000000..3b5ab5680
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d414g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d414g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61019e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe8d075cc9bff536acb3746cd1d6c51c7620a34a08bc6b57974821c2f0882666a",
+                        "s" : "0x538b2ed84e8c0bafa8fb0c548c38230830c6c392d52197a176be4cda6a90db79",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d415g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d415g0v0Filler.json
new file mode 100644
index 000000000..9d7ad2f01
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d415g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d415g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61019f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa1a2575f1cd921d9417dc2260f8c134d5bfe42043eb31d690ef0407d8710efe4",
+                        "s" : "0x71b45ee0b4690fc70ecf24022202fed30c62a29c794726d0ecc4af98a2c22d4c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d416g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d416g0v0Filler.json
new file mode 100644
index 000000000..3dddebcfc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d416g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d416g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101a06064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1a90b6ba5eee02b826c2cd6a8fa7a25d78e2bfc4e9b475339bba484d2dd619b8",
+                        "s" : "0x0712238d18fd491e50c65a57bba1ba8158480ccf9da953d427e1655d0070a0be",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d417g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d417g0v0Filler.json
new file mode 100644
index 000000000..8f094f911
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d417g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d417g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101a16064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb4bef1f9ab6924fd50f94fe36cc0ce37042eb7163dbd44aa28af14cea9ea00ea",
+                        "s" : "0x60c7545ec3a09cd291b354cdf76dedb4dd319192b4d32dc7f9c3f9c373034f5b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d418g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d418g0v0Filler.json
new file mode 100644
index 000000000..d645f07af
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d418g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d418g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101a26064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x15c61f83c1998504eb23192238342f66b8fa5b80b5e579a42d72c24a212fb61b",
+                        "s" : "0x0b93561e25362013c6148aee7aec5ee491ac1bda698ef4db3808b1e5fefd79ba",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d419g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d419g0v0Filler.json
new file mode 100644
index 000000000..182d9b7b9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d419g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d419g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101a36064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb65ca62a5b074f9472deb2ab052c2b3ca46aab8365c1ff0f7e3feb22adcd41ff",
+                        "s" : "0x3ffb361b5e993b02714dc257a844d9df9adf1c9169843b08d8e82696bbe32a38",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d41g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d41g0v0Filler.json
new file mode 100644
index 000000000..135f0a724
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d41g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d41g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60296064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x662dc20b1b054c881232c650a5f3b6ffc8311247b886852f164c3937acd30962",
+                        "s" : "0x310284f280a1fccc0f2a5dabdcf7325e93f1416fcae646e71d7ba2163c404485",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d420g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d420g0v0Filler.json
new file mode 100644
index 000000000..7a74ae5e1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d420g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d420g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101a46064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x46d28bdccbee7650ae7edccff87ca9e56decbb26e08233e8666d87117b189cc7",
+                        "s" : "0x137f4a7e823530b0409e32a63652911f79265d591aebf451ce6fd39fc3d0c15a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d421g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d421g0v0Filler.json
new file mode 100644
index 000000000..ddfda0db4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d421g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d421g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101a56064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5efebde46416cbf9b011efc909b4a6c1257403012c55089d4816f1af8c724282",
+                        "s" : "0x0da29562f074c24b65635bafa7a69e3551714883c3378b8d0dcff176bfa41a44",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d422g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d422g0v0Filler.json
new file mode 100644
index 000000000..41e03525b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d422g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d422g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101a66064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x98dc81a2c79f3e0cb886193cb54bc395c4113bb36c56be7ef53e0788c8d43bc0",
+                        "s" : "0x1ab154fe02a5c1831fde7e7e4cb9c532338bb54ee6237d6b15acca93d39244",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d423g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d423g0v0Filler.json
new file mode 100644
index 000000000..7ca2996f4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d423g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d423g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101a76064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa6be712808c534d9db766e385cf39403ce02d24298284bdbe54cb1d863904724",
+                        "s" : "0x3d22b14918bd08af02dfc20de9020d43c7b3196a7e7ef2686db7a0df5f39b0e8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d424g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d424g0v0Filler.json
new file mode 100644
index 000000000..ec17631e2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d424g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d424g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101a86064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5cfb980becede7074388dccafa8d65f45018a07dc961bb7ebb8eac362da3bce6",
+                        "s" : "0x5c093583933cda601fbeac69d263db15c5d57d76e082f453ab670ef903c34ead",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d425g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d425g0v0Filler.json
new file mode 100644
index 000000000..6225a8efe
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d425g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d425g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101a96064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd70f9732450fec0dca9ff10f92e478bfdfee9245c519e9166dc2c981d658a567",
+                        "s" : "0x6b4d48894c31f87cf17cf80e5ccc1c065056ea11b3ee3d0c3d3860879086c567",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d426g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d426g0v0Filler.json
new file mode 100644
index 000000000..afc40168e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d426g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d426g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101aa6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa5c3cefde0d5d626e6b620348a5290e608f7b509a50b6fc732dd64fcc8fdba2b",
+                        "s" : "0x3f0bc587ed7d0f8c6b15f5ba8ad7784fa2fe539a5b1c0756909fe3922258f7f6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d427g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d427g0v0Filler.json
new file mode 100644
index 000000000..7af4d2cf0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d427g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d427g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ab6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3dcd7a4b3d5c4d9952f1f2774e75846e75e6872395af82d8dbb0b8eab647da9e",
+                        "s" : "0x45f617bf4361129740f50833affe7351d0392be2b4e0dcfa7743f93164d47bab",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d428g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d428g0v0Filler.json
new file mode 100644
index 000000000..3df9542d0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d428g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d428g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ac6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x264fe82d9d3588e486a95149fa5ac0b3d8f20886da447b36e18c7e247dc985e0",
+                        "s" : "0x1202541529bf97891a61b0ec005c2bb68e4bb588b2c1d19b3b7e3b43880bba29",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d429g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d429g0v0Filler.json
new file mode 100644
index 000000000..10dc604e1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d429g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d429g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ad6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x63f6d943e5873b5f579c99b2f1cb367ae11ddc7c3d9be05cdd0bac1d5e516c52",
+                        "s" : "0x2f9790b74c2903584b231a3e4375ef7a51dfa5ee29e61574e30ee5b2cd9b0a7c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d42g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d42g0v0Filler.json
new file mode 100644
index 000000000..f62619365
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d42g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d42g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x602a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9658c932779a2dccc44ae859f03b8d58e1a1f6f094ece4cab031be74dbf17770",
+                        "s" : "0x25fd172a203e2b456933c39b49229ff33abe0154990a5b28a062c2fa3cd1a318",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d430g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d430g0v0Filler.json
new file mode 100644
index 000000000..d58229c7a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d430g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d430g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ae6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfe4128a6d4fdacf967317f309b4d14b429dd3eb075b5913ec3abf0ffcb5dd5a9",
+                        "s" : "0x22fc1c1f52acdbdc68ead53589da2c7187456be0d6ca9caa0c9901183cf1bfdf",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d431g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d431g0v0Filler.json
new file mode 100644
index 000000000..34f69eeca
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d431g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d431g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101af6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc3353cf351ff50ef9c164f5d94c972217c7697640d8be08e413336602803cb42",
+                        "s" : "0x595f50cc6a933728fdcba6050c218c02def4267dd9097d6449ffbdd166412daa",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d432g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d432g0v0Filler.json
new file mode 100644
index 000000000..e561e11e6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d432g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d432g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101b06064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd3f532976dc137d29ab51b914db7eb2d67bf9306b399e847c9757d6966ceeb0f",
+                        "s" : "0x22627c0ddc34397231cf3e621b44d6204a6d8e81de09b6f8546a7ee7d4fff194",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d433g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d433g0v0Filler.json
new file mode 100644
index 000000000..e39ed0b61
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d433g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d433g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101b16064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x92ec737e77f57f0cc6537bf65469dccbbbfe010108e031bfbcb15b283a74c913",
+                        "s" : "0x212650664bdd21b328a654df53a52604ad63e5387828fed71e0b2d47e2218dab",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d434g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d434g0v0Filler.json
new file mode 100644
index 000000000..957b97d89
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d434g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d434g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101b26064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x57610221fe50e262b943219c2085d28841289d775f4fb19721a822708a408395",
+                        "s" : "0x5f38ad407f766e0cbb67d513e29709fec91dd0255ed860443d82328c4b4d6936",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d435g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d435g0v0Filler.json
new file mode 100644
index 000000000..0beed6221
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d435g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d435g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101b36064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa31268dc83629fd7ead61b43eb3129f230497b31704f9937d9c6ab53edd3d2ec",
+                        "s" : "0x49b218ed491df21af50f24431d9a9c3f75faac048cb4e90bd545d05292a20092",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d436g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d436g0v0Filler.json
new file mode 100644
index 000000000..0cd163563
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d436g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d436g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101b46064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9fac7f4a3afde85a06282b8336be1da739019e389054998cf8419016ba76a818",
+                        "s" : "0x297d9a0d47624c3ee749f914bd89adec976cf49dd49ed97b6b7a51ae535f0095",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d437g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d437g0v0Filler.json
new file mode 100644
index 000000000..ead184fa4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d437g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d437g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101b56064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x588ef47fac8c7b5b4003133c16d3252b6ace647eef7e88f7069fb5b5887e090d",
+                        "s" : "0x74f1d3795b40707ce9d6a822b7c6cd278df4d7e1e4f87be3b79056a74645087c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d438g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d438g0v0Filler.json
new file mode 100644
index 000000000..21eb04cb1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d438g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d438g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101b66064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1e960831a7bd6904eaf6265e546f7f0185e1099b057597e3771c30e6b497ba98",
+                        "s" : "0x7bb211c18853814d33d5e554e00996ce64d795858556b2b07785c0754bfce33d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d439g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d439g0v0Filler.json
new file mode 100644
index 000000000..43388d226
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d439g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d439g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101b76064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7993e9892ef8cc7f020073ab12295b9930440f41f5660406a58a81c9033b15cb",
+                        "s" : "0x33bbdf03b906fd366be46b20c9bec63dd2969e1ce7f9b33155cf3ddc257f9542",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d43g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d43g0v0Filler.json
new file mode 100644
index 000000000..8ccbbf5be
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d43g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d43g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x602b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf81ae0da0f607e84b135d7613b32810563936e3214f6a2d6f427be70689647eb",
+                        "s" : "0x4b98c676fe5684fad889d359c199b998eab9ef02fe5b17fdd7d161a3fae332e7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d440g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d440g0v0Filler.json
new file mode 100644
index 000000000..26665f1cd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d440g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d440g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101b86064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa60e7f7744062a53c1e9f246f002e7f6ff9c98641b64ca236a345aa98561c21a",
+                        "s" : "0x0166c9b67b427d6c5ffad6569f623cac294e7c18727258f3be72ee6fd4ded88c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d441g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d441g0v0Filler.json
new file mode 100644
index 000000000..77c9b7b59
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d441g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d441g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101b96064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa7d92526da3157c17782c13bbe45d37e5f18022ecf0e419b2174a5a9e29ea594",
+                        "s" : "0x25fe8b740be6e228c6b4516888c732fa72de8e4a981216df9f48c1415d84661f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d442g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d442g0v0Filler.json
new file mode 100644
index 000000000..49feac4ea
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d442g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d442g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ba6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfcb5e8060196ec7a93ee245834173eface77c1197454cbf8df8fe8cd1296146d",
+                        "s" : "0x1bc15d2cbd55db805b23f47c71119850d33b2eb393777dbbe23779a676bcd63b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d443g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d443g0v0Filler.json
new file mode 100644
index 000000000..78dddf43f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d443g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d443g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101bb6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x167a35ec8e52557c18847babdb740ded51e832babbf8939dff62e75f4f48ab3c",
+                        "s" : "0x28f6f84182505cad5e2a250066627159a526951c9d76eb3bfd6958ae07a53e4a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d444g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d444g0v0Filler.json
new file mode 100644
index 000000000..b4ea726ea
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d444g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d444g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101bc6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x139885ea3853a4a2079371d2789f1d5f119e910933c2a80d282f0a5a1e07fb67",
+                        "s" : "0x5adc18e574f1e03db0668f5f18878884c698200b55cde3e511c9abd1644ee010",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d445g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d445g0v0Filler.json
new file mode 100644
index 000000000..447eb4e01
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d445g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d445g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101bd6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x124ca727c5ca33648f1b89a797a9b5e930ac28dbeae0d7c0e70d8785f7b301fe",
+                        "s" : "0x2fd614f1204af08f98fe611af5ea58c461c66e5826999e9e481f6db9e60898a9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d446g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d446g0v0Filler.json
new file mode 100644
index 000000000..f3a9d53ad
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d446g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d446g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101be6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x16e0e5430c77df35dd5bec80c663b24c9164d801ca57ddff56d6e6ffafe679c8",
+                        "s" : "0x075a876207557610c36880ac231d2f4242c748be265fd21caa5463b52d729edd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d447g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d447g0v0Filler.json
new file mode 100644
index 000000000..bc81a0014
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d447g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d447g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101bf6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdaf962030ee55a6d99e6dd54026c12c9626d0e5c859addb91b4b31313906b81b",
+                        "s" : "0x060e6e1b02f467cfdda14e3f1f3d92e4e19e5e759cf7d7844cf21b768a3567b2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d448g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d448g0v0Filler.json
new file mode 100644
index 000000000..08a2b9cdd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d448g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d448g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101c06064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa7c80798e32d2ad4c108d1d9663d569508cf7db99fb16551d3f444542ae76c36",
+                        "s" : "0x3f78a675de598c1543aa82af1759471e597518b1101a087dd8a4b2d1d1a15b19",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d449g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d449g0v0Filler.json
new file mode 100644
index 000000000..c258e7269
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d449g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d449g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101c16064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd5350d6cfe1f06e55e3e341e8f62bd53aa55e83c74b1398e05d0636daeb6a1c3",
+                        "s" : "0x1c1d62b83d1a1930c9980eec689290a87cbf664ea2c4119fb025e0016aa9619a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d44g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d44g0v0Filler.json
new file mode 100644
index 000000000..e49a5abff
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d44g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d44g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x602c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x750e0d9fbaaf09b07f02f7eaeb6b743f75fd33020fe4804f0120bd0786ad8ac8",
+                        "s" : "0x140ce371daa025f922de51982725d54adee0f92ee29d3325a386203c9cfeb09c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d450g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d450g0v0Filler.json
new file mode 100644
index 000000000..8d507ccbd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d450g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d450g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101c26064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xce4d16958284fe0ad609adb4337b9974ebfa9e36c1c53edc3d0bb9f6565ff5d4",
+                        "s" : "0x551a171c3fab7e0fd53a6c27fdd73a16c0f3c7cdd9cf3e3395e60a318f7b7b05",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d451g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d451g0v0Filler.json
new file mode 100644
index 000000000..458cfc3d5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d451g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d451g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101c36064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb03ef36c50462687df8744a1fc2b95221820e1cd4545fafd5471436e3d143f28",
+                        "s" : "0x6ee862557cd4af4f588034102074b680cee4859ab56a93f4bb6fe6e71f2004b5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d452g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d452g0v0Filler.json
new file mode 100644
index 000000000..c908ce446
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d452g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d452g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101c46064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe34aaba993e43d82ab99b35084b9f4e26195052680093337689b0d891673fcb9",
+                        "s" : "0x0a3beb7430e2f38d029a8edc18b846894b9f0b7163ad3393fdb32ffdc4a4a02c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d453g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d453g0v0Filler.json
new file mode 100644
index 000000000..7c8995ea6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d453g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d453g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101c56064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x18313099bd8ea673bae69026a3191fe9d0b2c5a98812d9a5be4dd29282fba6ea",
+                        "s" : "0x295c001fe908a9973ce7561f7a94e16b8143fd3397d5748efc7d9b977e42c0f7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d454g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d454g0v0Filler.json
new file mode 100644
index 000000000..f8f70081b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d454g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d454g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101c66064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x14fc24853c509bc6f9675a870f8519d3e504d6827f00d2e0b68b3de30437906c",
+                        "s" : "0x370f46b9eb15af4f3dc95fa5ba3bb2c19aa705a89337b282011d45077bea6464",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d455g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d455g0v0Filler.json
new file mode 100644
index 000000000..568e32b8f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d455g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d455g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101c76064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xde82c454603581e105663054089bfc3700e9bbe1f9446408c36360e510ab299b",
+                        "s" : "0x01a1695663c3cca21c454735f539ca55a1cde54793958d79309e2a27a6c66431",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d456g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d456g0v0Filler.json
new file mode 100644
index 000000000..3af2f1a20
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d456g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d456g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101c86064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd9880fbbe702c0a286f752c68f8514cab4dca568d092797487bfb9b911a9a4de",
+                        "s" : "0x3b1855068f0d51500cec4efe553d3933ed2df845cbee93ab4ace6cd7b06f7d2d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d457g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d457g0v0Filler.json
new file mode 100644
index 000000000..76b00f6ba
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d457g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d457g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101c96064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3809d1cd0c524cad7471a6856cc14b9b183b6258ed57915aa925bf1b48091464",
+                        "s" : "0x3c786f597803870933b97952fa685a866c6a515ac9659cdaeda0e03db6adc657",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d458g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d458g0v0Filler.json
new file mode 100644
index 000000000..a3d52e771
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d458g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d458g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ca6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb4ee9697dedda9e32d2bdb99f288ad06ee07c8a4dcacb798c4fe82214a6b2646",
+                        "s" : "0x51838b31ed26aa669f7c459237473a8d7d2698f7a8048da46e7d38480b66953c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d459g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d459g0v0Filler.json
new file mode 100644
index 000000000..557d6fef1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d459g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d459g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101cb6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc029bbce4fc8c0d66d532c8e17532db5b3d68cd70571514aa007731df3ce4e89",
+                        "s" : "0x56334b9fc01bcfed348e4d35e8b29512bbfdd221de178939411f11afcc0cfd58",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d45g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d45g0v0Filler.json
new file mode 100644
index 000000000..5b03d47ea
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d45g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d45g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x602d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xec1b524dae6540b0e24a9b6b2f63a336d599b876e3904f531c79bcc5f659d055",
+                        "s" : "0x0ecf942698318fb150b242eef2e09ad97645919135b2a786a701e58da7f2ec5d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d460g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d460g0v0Filler.json
new file mode 100644
index 000000000..51213ac62
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d460g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d460g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101cc6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf8cf313fd86c784c8f58340c622fe421f0c2c529a266bb7148ce2cc37d73a6c8",
+                        "s" : "0x6fb4636096f0f155d65589e920de40b00630aed248549d5d2812468dd80213c7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d461g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d461g0v0Filler.json
new file mode 100644
index 000000000..abad58a4b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d461g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d461g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101cd6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbe2ae9a2bd132bf955bed666f9943e274d49fe28c99c820bb1d0f2ce04657ca8",
+                        "s" : "0x4355ae9899728359379b851450dde1fedd3710f44bf18a200a8bde50381228b6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d462g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d462g0v0Filler.json
new file mode 100644
index 000000000..d3b25387d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d462g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d462g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ce6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x26dcd45a2f878d608f1c8dde76652076afb0d6ea8899bbb92731fd4e84ecc20c",
+                        "s" : "0x04bb0aeb83f6f8a0a66033ee04fdfd4df95dc4f09194f636381e29ad0d00d223",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d463g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d463g0v0Filler.json
new file mode 100644
index 000000000..e3e25086f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d463g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d463g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101cf6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6e46998ed7e96549e59322b544138469964895165343c6a3eae2522c90a6c682",
+                        "s" : "0x7b84fe84622e4588ff98c4b7107ee5cad6057b94426d91e64ad7267f8f130efe",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d464g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d464g0v0Filler.json
new file mode 100644
index 000000000..4b8f459d4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d464g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d464g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101d06064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc6f3d6a77b6a59db0b882c390f5866e781c97629996d3434480fc47b01f69042",
+                        "s" : "0x507ed77b607186cd1120771313e2484530b491b83bd77f0e9167a2c7b56be19e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d465g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d465g0v0Filler.json
new file mode 100644
index 000000000..ccdfc8b78
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d465g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d465g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101d16064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeeb06a6d05277c0d9abfacbf7bdb8129b54ead7590e6363e89d8536d1a10d1bd",
+                        "s" : "0x7d7892c7fce32530785e12fd716662d7ccf8cf661bc1cb44e65e6610a0a94c7e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d466g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d466g0v0Filler.json
new file mode 100644
index 000000000..28d89711f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d466g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d466g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101d26064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5a2b09e02f6d74146de1d913c03937b6862d46689fcab8836f47216433b8387f",
+                        "s" : "0x05887bb75a1ade02d8a5cc2b12ca96a6314dba7db036aed69bd5bddd67e208e4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d467g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d467g0v0Filler.json
new file mode 100644
index 000000000..1cf59e357
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d467g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d467g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101d36064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7643636344c4285c236c74a147e0cecb6c6d6b3fef6d79f37f2b7a106a5d4dbc",
+                        "s" : "0x6733dda3d5532abd572071dc38f90b329f95f5e665ef89f1deb40f4ca00b910b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d468g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d468g0v0Filler.json
new file mode 100644
index 000000000..b82d32b87
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d468g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d468g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101d46064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd2631649a60f9da0a5aafe117b6c7a73cf5360b972c463b655bb99c2a006c959",
+                        "s" : "0x34e45c8ed096046d8cb2e9a05f931192f7cfefdf6cef80b2754a62eb3de4ecdc",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d469g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d469g0v0Filler.json
new file mode 100644
index 000000000..0fa3d9e8a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d469g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d469g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101d56064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x06c91a2e6763c36fb3a518877d104c44685b7d824075792a10e0db0f417b2bbc",
+                        "s" : "0x64c7ec35a45c19a50c2fb9f6bfcb652d6d751f404bb8985dbe7e301c4c7fe940",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d46g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d46g0v0Filler.json
new file mode 100644
index 000000000..eb208f410
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d46g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d46g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x602e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdbf2bb2df18d7a7c8f50a03a2e43ed8e5b412ba1ddbdf56101a0c76197e7e091",
+                        "s" : "0x1c93c35b2a99b48b26c03d9c76d6106d55db56dafad6cd16825115f62868ac98",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d470g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d470g0v0Filler.json
new file mode 100644
index 000000000..b39cd78f4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d470g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d470g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101d66064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa7c4ef4b8711242b9cd69dcef652f617f3df604e63321a1b4c750d894ef0ef23",
+                        "s" : "0x06e44f2e284fdc22063655bb89ee62eafa5db01f633bdbdf4ef1408ba346c4d3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d471g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d471g0v0Filler.json
new file mode 100644
index 000000000..1f4bfdabf
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d471g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d471g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101d76064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x51a154c8fdd6c726506ca835d1727d88dbd4a902157e5660706e4d5c669fc2a4",
+                        "s" : "0x0d69798b37615bcf708acfb5ba5b8908f146b4450037807ac1bdae50c1ed5831",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d472g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d472g0v0Filler.json
new file mode 100644
index 000000000..69dedbb4d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d472g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d472g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101d86064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x206f5c8404ac035b9c8f67418855551274f8da2b6856899eb6635b6489e6b721",
+                        "s" : "0x79366b28b3104328e875b1446f2e1ae042c3f0dfe92507057076c97cbccf8928",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d473g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d473g0v0Filler.json
new file mode 100644
index 000000000..b54a548be
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d473g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d473g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101d96064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0a6dc423ad52befd6652748c1379181ff1e2bb581a1277e93d231814008f87d3",
+                        "s" : "0x2930ded6e892120cbd1935c834e406bf730eca5355f5d0dae9b80d683c17e5a9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d474g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d474g0v0Filler.json
new file mode 100644
index 000000000..387652d40
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d474g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d474g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101da6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x323acc5c70aec70e20e6ad150ac0bd94eeccd36a5106d1953d68825b5d3dbf46",
+                        "s" : "0x312b8ec0b4c693d1e20f1c8ff8550d2b04ddd29a897acfc850c2a4f969789474",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d475g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d475g0v0Filler.json
new file mode 100644
index 000000000..5ba81e65e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d475g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d475g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101db6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8eb1608bb504f58ec9f16b7c9256ec273a9fb7635634d4725c1c67ca20b588b8",
+                        "s" : "0x343f88510d2aeaf882b590dfc50202798d259ddf18b89cbceed07971c9700e0c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d476g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d476g0v0Filler.json
new file mode 100644
index 000000000..c9266bde2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d476g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d476g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101dc6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0615d0f7e07b3ff46c9ccc54f2028010b2aa12508537d0d20627b3bdb0c857bc",
+                        "s" : "0x15be11c47e0bab32875025d85fb767c60e50380d82ee576cc52e8fe766f02f65",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d477g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d477g0v0Filler.json
new file mode 100644
index 000000000..10ce72e93
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d477g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d477g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101dd6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x591a07729b2f23b2993088110a731f94fc7550a7062ae79fead373d6406bd6dc",
+                        "s" : "0x054d738735557cab8d03f290f9fe4a3e823ac1105f585c8d6403c89c4e8c963a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d478g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d478g0v0Filler.json
new file mode 100644
index 000000000..cf7d31c7d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d478g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d478g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101de6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd590772714a75896c5d3a409f6141e1528ba9125a5ce5fbeeec6969319c2ba75",
+                        "s" : "0x3ef9f2945fa17331227cf2563eff53786ca498496bda1a7e705cbb2f21bf1d8e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d479g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d479g0v0Filler.json
new file mode 100644
index 000000000..bd767d97a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d479g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d479g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101df6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfeaf696431f6bf811044b7dd33d82889c53544c5aeb66013907d9ce79972fbb3",
+                        "s" : "0x525bceb5509ec8a5ffd51e039b00eaf3a7a73a59499135ca60c6d92354930b46",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d47g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d47g0v0Filler.json
new file mode 100644
index 000000000..4803dc76e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d47g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d47g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x602f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6949154d217da811a4fc3d257fccb28ec36d2771ad2fe2e651dc9d9428d702b4",
+                        "s" : "0x0d4acd9e17b14de17c38bd7f472c0b8d7003fa838eff6c24d8cf6f226ea1ad19",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d480g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d480g0v0Filler.json
new file mode 100644
index 000000000..ee02ad63b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d480g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d480g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101e06064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7b54716b99ae907bee016e75f00d3dad10b8afd81c495f074325b9a129e69adb",
+                        "s" : "0x6e2ba8c711ec407ef1256af5b3c01b291ca493005cf45f5dded83aef784e36ec",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d481g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d481g0v0Filler.json
new file mode 100644
index 000000000..6ef642a90
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d481g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d481g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101e16064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7a6216bc81fc84c9f2193106176459b9e2ceeea3cc1754ba87aeffdd8fd62949",
+                        "s" : "0x3cf60a4d353b2d2f9b8ff1407fc2f7fbd10890e684dcdfc75cf18b126669bb35",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d482g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d482g0v0Filler.json
new file mode 100644
index 000000000..b4bf10fd5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d482g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d482g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101e26064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd4a109b17638bce43aed49b9c6fdd636f642836e7d2ea24845796026243efb64",
+                        "s" : "0x32454798623e78322dd48214d335d3740603d4d1c67f68367f02017793c4b3b4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d483g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d483g0v0Filler.json
new file mode 100644
index 000000000..f9a4e586c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d483g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d483g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101e36064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe60b6c8fa3f778bb7a45dc952ab0b8b763123b04a0087fb40744720b1b6d9617",
+                        "s" : "0x7e2de2ad767c79551efd2ec4543aaa4e8b0c4264f91f98504a510620bfa65009",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d484g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d484g0v0Filler.json
new file mode 100644
index 000000000..14125de53
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d484g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d484g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101e46064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdda95e55fbfb2861305eb53946ff0e3a153a49f0742987f748d847cc1049ca68",
+                        "s" : "0x2fbcb1e7de0c349b30573b2a9c9b65263950129b85f96d871c31b0f0e0dc06a8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d485g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d485g0v0Filler.json
new file mode 100644
index 000000000..ff4c65a9a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d485g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d485g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101e56064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8ca3b2844d5dcdc9a14da1881038ad26c9f4765c9623787b913eb5a6b8c065a5",
+                        "s" : "0x10416a0e791febbdcc246ae6cf025fd6c567d3339231fe2860dcf1706ae0f65a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d486g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d486g0v0Filler.json
new file mode 100644
index 000000000..f0e41f58b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d486g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d486g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101e66064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf8d33b57b74d5098d7026e955b20b0538f3003d7596e1dc8cc879a58d73df157",
+                        "s" : "0x7413349902a3e485c4788e65b92f5e2fd32256fdc5d35075409cc76a76728bc5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d487g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d487g0v0Filler.json
new file mode 100644
index 000000000..da23c7dc9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d487g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d487g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101e76064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc74650f06df01d4862a2048ffd5ea087e066793631d99e9a2239f843aeddeb7c",
+                        "s" : "0x10bafa296eeafc466a588426ad42e0a22d841b504274e81bedc93e61960dcfea",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d488g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d488g0v0Filler.json
new file mode 100644
index 000000000..259271998
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d488g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d488g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101e86064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4cea2f97ede86f73ba8de89ce449fb014acf26453414a1cdd3373772227bf53f",
+                        "s" : "0x733de3f7d546c1f3a16e2346f93e27408464befe1097bb685a76887255bfa273",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d489g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d489g0v0Filler.json
new file mode 100644
index 000000000..ce35c5682
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d489g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d489g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101e96064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa7d0c41698128593896904a2295c27634ba48f261e177c628399f67882311e0b",
+                        "s" : "0x2dc5dce6eda107b0f85a65f835b5d1cca18c4402d84c10a078e9b91185ef48af",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d48g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d48g0v0Filler.json
new file mode 100644
index 000000000..9884fe496
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d48g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d48g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60306064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x27ab085b57c32108d969304c5bbffbfd17465617e74f34a44cecd8794c5c3ec9",
+                        "s" : "0x6d540970cbc68c0daf32e3a69c1a30eed2d05203d701fffe576e281fddc25f92",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d490g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d490g0v0Filler.json
new file mode 100644
index 000000000..4a22c3a2f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d490g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d490g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ea6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfbee826bc0bf200ee4929ddf20693ef6b8289706f16eabe78867ab74c1e555fd",
+                        "s" : "0x1e43fad9caf26542d9f224e9a3a3e898c5bfdb5aef05796d043fa09cbfd22a26",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d491g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d491g0v0Filler.json
new file mode 100644
index 000000000..ea2430447
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d491g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d491g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101eb6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc659406618b4194e7ac5218e3a86e948995689785956e0337e827e2ff68d96a1",
+                        "s" : "0x660b1a49d4670800869448ad623f7084328ff9788ee3242a40c42286c4df6c43",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d492g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d492g0v0Filler.json
new file mode 100644
index 000000000..aff4ec2b7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d492g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d492g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ec6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7de832c6d821bcc1ceb6981881af3d664e7ade6f088cd83152af20e5ebc97ced",
+                        "s" : "0x2d42e9b80fa432f3877d824db64d1e431950a9b33b381406b1123129735de5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d493g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d493g0v0Filler.json
new file mode 100644
index 000000000..803896455
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d493g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d493g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ed6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7193113c68998c287ff6cfdf75f52444e3ed0b6a4b82b96ec4f9fb155d193970",
+                        "s" : "0x54a69bb44035095c875f06d42a0cc183d939c3c8129402458feedb9811f33915",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d494g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d494g0v0Filler.json
new file mode 100644
index 000000000..52319f0e3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d494g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d494g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ee6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x39f92498f3e69edb9bf4f6198fb871664f61625ea6547e85d4d5563d220d687c",
+                        "s" : "0x7718fefa31e4bb3f6128a46167a2a83f3e811ab7b6998e456df2744a767cd259",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d495g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d495g0v0Filler.json
new file mode 100644
index 000000000..53de52b8c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d495g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d495g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ef6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb0cc83d145b1678b9a5569f59d1e49662ac65894e17da94dc9d9dccf5b760fa2",
+                        "s" : "0x52a5446f8a0450b282bca44baba6eb3bad8692b614b7e2786d3cba58b09fae78",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d496g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d496g0v0Filler.json
new file mode 100644
index 000000000..420af9169
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d496g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d496g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101f06064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9dd1475c25d956524ef4964d98119984758033879ac5ef962000d2e4a1341f00",
+                        "s" : "0x1daa8276ebc6bf4a03d64c671e681732dedc282985d50eac90602022ccb895f5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d497g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d497g0v0Filler.json
new file mode 100644
index 000000000..a9c16969d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d497g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d497g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101f16064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x713b63f86d280ce9a27bfe77e1c6d81411d931ba8147e2b141749cc444f38b8c",
+                        "s" : "0x0a26d9bd4019eff0bb1e1815f5f6a78d5d41da7f7fd66d92712e8d5b450ec178",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d498g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d498g0v0Filler.json
new file mode 100644
index 000000000..84d0cd885
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d498g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d498g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101f26064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xff3897d39dee2de5472b89d6547eae6f45f45254f92a1d21c7d086ebb3f91366",
+                        "s" : "0x38a2542c0ad43e85a8fdaebefddd6ebfb2cd1e278a1ed40e6191de799d24b1c2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d499g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d499g0v0Filler.json
new file mode 100644
index 000000000..66eff198c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d499g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d499g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101f36064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9bde56d00b4be6d013bbfe85dd3d5b9b660aa6d54cb2fc846c90ed6a16bcba71",
+                        "s" : "0x1b767704bec3de0a96840ed1a90d3bfa33c5d2c95068567706d0b072ae0f5cc9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d49g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d49g0v0Filler.json
new file mode 100644
index 000000000..3ae2faab9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d49g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d49g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60316064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x14afb6d7a6b567d2b2bdd2bbf2a85ec0cd78ccabcae8a1ee9834e5f53368c1fc",
+                        "s" : "0x77c2b8283d66482ae9ea9738b7b4ea45669e9127c93f5a9ee09f6b4571c02e3c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d4g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d4g0v0Filler.json
new file mode 100644
index 000000000..f5efc33d0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d4g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d4g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60046064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x111df19f7c6245944b88a776b5178a32b13f22ed1118de440f9db6f6151028fa",
+                        "s" : "0x59e367d18152d6964d5e702900a7cd64120f50ee1d0326fe5683b1fe73e6b5b9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d500g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d500g0v0Filler.json
new file mode 100644
index 000000000..6e65ea44a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d500g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d500g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101f46064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd34181eae90f18f2f4c0031f8bef0a881eb69fa43de116969917da9beaaf1308",
+                        "s" : "0x17939ecfeb48dfb6634e89e99d79615ca380dfdd749d7713f5de8edb21e57cb7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d501g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d501g0v0Filler.json
new file mode 100644
index 000000000..e1a14aec5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d501g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d501g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101f56064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe5e3b1447b9c34cdcce49fa33132feb36a89ce2920c8057d1a1bcf3307441f7d",
+                        "s" : "0x5619fef5e18a59df26bb40d4ad000eb8ce6f42abd9d55ff2f2c27934729e4b8b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d502g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d502g0v0Filler.json
new file mode 100644
index 000000000..02594f8a7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d502g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d502g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101f66064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5ed7516745bbcf262fea32211fbc5ec9eaa8eeac2bdeb52abc8b7b30fec5dd21",
+                        "s" : "0x03ec400ce23cc3127615d460f0f2076087fc0259f15f0f917f7f34b98ba9ed85",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d503g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d503g0v0Filler.json
new file mode 100644
index 000000000..c10283084
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d503g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d503g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101f76064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8cf3f7a48b78080ed8aabf14ba6ebedd24ee8215ac8321d7d696a1606ca31d2c",
+                        "s" : "0x23b3634f02c370508a868cd37e3cafdb51b3f95c7611f7bc1fb7bf5e24267704",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d504g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d504g0v0Filler.json
new file mode 100644
index 000000000..74d23f704
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d504g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d504g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101f86064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb2ee560b67f795853d08a8ff60d7e9c711b15c41ad761eddcfd80b2994918aa7",
+                        "s" : "0x1f73e2c941bec5ecb83e808f2acfc1896285eaf8a19600e7d179b9eadb0fc953",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d505g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d505g0v0Filler.json
new file mode 100644
index 000000000..d6fb228b3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d505g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d505g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101f96064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5585b7c49972e1f6ba50ff3d9bce0ece9964963909709b6b6ce3107442869229",
+                        "s" : "0x3f76e6d4cf4daad993c4e4b23485fe1ab029630a0f235a7a64241c4dc6cc64f9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d506g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d506g0v0Filler.json
new file mode 100644
index 000000000..064007a87
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d506g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d506g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101fa6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x57c228ba3b9c28224f3b75024062edc328e3d4bba811194c625264aad6a8ff00",
+                        "s" : "0x22bea04ac1c33337085e415dec3cc7ed97a5612dbce5ae1b4a20e9d4a79254fe",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d507g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d507g0v0Filler.json
new file mode 100644
index 000000000..4e82f863d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d507g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d507g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101fb6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe1df19e5e6c9284f9432bc58a2d56567de419fdc085689128a8427b2607f3ee9",
+                        "s" : "0x28cc35ca0dc105050f3921ca6fecadc51128d06dcf32b41e8622cb618a1e8237",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d508g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d508g0v0Filler.json
new file mode 100644
index 000000000..3d890b38d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d508g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d508g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101fc6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1cf09c8609f7929efa5336d59f74d5cfa812d45ffdd659b8aea27a469fb68906",
+                        "s" : "0x1e35d02a30f8cb6d8c793a9bc39eb25d0e918ab60ceb3f0481c0a05ac03078e4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d509g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d509g0v0Filler.json
new file mode 100644
index 000000000..730f0a1a4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d509g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d509g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101fd6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb04eafd7f276cac78a1d7f3b6ed8a40ee42ca1f30e12da4b6f8973e4b3a027ef",
+                        "s" : "0x253529a2d345c35c4f67f89b2b1ef4f63bc23ac4cdfc86ce6632861e552e0971",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d50g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d50g0v0Filler.json
new file mode 100644
index 000000000..da9605807
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d50g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d50g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60326064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x56fa0b9144285b8a91bf6ad16a9433d36aacee77fae18bc48402a795bf796c97",
+                        "s" : "0x7c8c57f605981ea2235002623ee5d0bfc8545075e6a9f1af859efec351299ff2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d510g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d510g0v0Filler.json
new file mode 100644
index 000000000..64589cea3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d510g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d510g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101fe6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x71286bc5cbe1be22b6e7fcdb6be0407a2284935c886bbbbc64a31ac741798e8f",
+                        "s" : "0x697188ebc5165288643e1a388ebb745e3c36a106a10a8e09778b8cb7df091e5c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d511g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d511g0v0Filler.json
new file mode 100644
index 000000000..c4bea9fdc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d511g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d511g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ff6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe595d883bbd4b4d35d6dfde3a38b7cce225619e0ea72e9ada204594a8569f51a",
+                        "s" : "0x2ac1839d76ed7353ce6fe886c15806311c583b1bc473a251e3bdebb059df5190",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d512g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d512g0v0Filler.json
new file mode 100644
index 000000000..f7314c78c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d512g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d512g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102006064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfb902f15da8a43f1e1f260090192c0d378b365dd0acb44b6d2d9528ad0e4eb00",
+                        "s" : "0x56010830f989249abe98fd0855ad4d8bb547c637073c9a485394b9b75afac659",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d513g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d513g0v0Filler.json
new file mode 100644
index 000000000..824e2c890
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d513g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d513g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102016064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x84bfe5c7be59f797a89b8a251141e521709baea6bd4f432a8c8e326dc24d6f97",
+                        "s" : "0x1b35858fc5fac01f90b30414be647a20f06cfbc5ddeb7dd90114989550a57287",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d514g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d514g0v0Filler.json
new file mode 100644
index 000000000..ebaf56164
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d514g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d514g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102026064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0d03478a6847d15e4795492ce8324e9599487638d9b37dd172a0644b96cb24c3",
+                        "s" : "0x37b0380128dd59e4db81489a4d4b946f7b8725e0206a0887d9eecda10664d265",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d515g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d515g0v0Filler.json
new file mode 100644
index 000000000..b56b61a19
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d515g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d515g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102036064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0b35fe2e4011a0da2bded48c66ddd03888565ce1f8b24eaeb58461364299fec1",
+                        "s" : "0x383a65b66f56d0fb0572dcf6cdc697c39cf6e0ccc01807d2f17d316fadac3362",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d516g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d516g0v0Filler.json
new file mode 100644
index 000000000..e79c6b484
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d516g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d516g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102046064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1952d85e9e7e9917a014b828b0415bacc1634340e57558bbef6bad4321f676dd",
+                        "s" : "0x5565fb3169605bb1acca4895a16b2614e012cbe8c63a5da0b9f0590fe0c39876",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d517g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d517g0v0Filler.json
new file mode 100644
index 000000000..5b84fd119
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d517g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d517g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102056064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9a297b29c1e63b4ef936a2dbb62a9bcf2098e689a792d5114f971b162720c5ce",
+                        "s" : "0x144f1d0605b82d1587caa0f2d9331e86a9e3d01251632c0fe291b38de328526b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d518g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d518g0v0Filler.json
new file mode 100644
index 000000000..f7a839867
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d518g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d518g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102066064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb3de54936d1c064d3cf246360a5c97467279f5ae7a7a230fe55fbfd5c21a3641",
+                        "s" : "0x3bd191a27154de966c59c38f17c7a484eee4568cf37f9f43e54683971f77b9b8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d519g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d519g0v0Filler.json
new file mode 100644
index 000000000..9ebcda494
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d519g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d519g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102076064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x247e89ad0a4938ab74561c58dd04cbf8c6cd090ea1a1fa5a663cc994e42e593d",
+                        "s" : "0x2457bef654c05e8242acb50a5e98f82c8f2167bf5da1ec682ad829673a362366",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d51g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d51g0v0Filler.json
new file mode 100644
index 000000000..6646156c9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d51g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d51g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60336064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xda097da646ded6b4d3f81703c1a91a62198f8f2f39f3fc66f8009eaee9c001d2",
+                        "s" : "0x756ee4ab995a8f19cdb5b3a931b14681fd9802364308bd60715b575555b2bd1b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d520g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d520g0v0Filler.json
new file mode 100644
index 000000000..c8cc60746
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d520g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d520g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102086064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb3cd41f7f0d66df96e9cfbf0980a3515f797a3013d729394caa54ec32fa94354",
+                        "s" : "0x0e0e57f1b06ef102ac3af7be7d0677369b2235a32e8013c67696c4507ce1e085",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d521g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d521g0v0Filler.json
new file mode 100644
index 000000000..c355720ae
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d521g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d521g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102096064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfa6af938941416dfcb8e41f610b74793348450f390e8de63a73980e235c91f2d",
+                        "s" : "0x772cef41138284d5a6696fb2d56b1263aedb0db5554be744163dd0995516caeb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d522g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d522g0v0Filler.json
new file mode 100644
index 000000000..286bffbcd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d522g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d522g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61020a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9e7b2f9f87bddaf34bacc44baf9ff6804e202c077a694aa717db763a5ecefffe",
+                        "s" : "0x63b6ecec4a34ded7dc529a882a7f5d6591954496d03df2f82cf56d802175f580",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d523g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d523g0v0Filler.json
new file mode 100644
index 000000000..5c77e7cb5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d523g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d523g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61020b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x92beca8f2b971fd81067658e6917a0fcd03c7a268f0d4a4657a5d10e56fd19b1",
+                        "s" : "0x59616b1caf2bc3513e0c4f8986f5f863468c124f56a41bb229553e44126d1555",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d524g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d524g0v0Filler.json
new file mode 100644
index 000000000..82038f8d0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d524g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d524g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61020c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3b105aae650eae60247342740b76c48a92fd3001d3fec6eadacbf60e6f35c97a",
+                        "s" : "0x76f794468e0c88763405d2d6499125b526195355da37f1d5745423fac2cd6c1d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d525g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d525g0v0Filler.json
new file mode 100644
index 000000000..1488acea3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d525g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d525g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61020d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdea3ff580f549df04b194dd41ae59aee8a0eddc81827bd21725e5fd062b1efb8",
+                        "s" : "0x1bb62b648a7c8e90b75092e47afd2e563b7a5e4da78ce2c335164df1d5ee06cc",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d526g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d526g0v0Filler.json
new file mode 100644
index 000000000..a1f058460
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d526g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d526g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61020e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd29f81191ba44da38dd01a1e8853eb5d4b271d9581b4070635bccf3d02380d31",
+                        "s" : "0x1ce8bbc6c8c29f40480fd85ef26555ea9b663bc857000690fb784ba44d082860",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d527g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d527g0v0Filler.json
new file mode 100644
index 000000000..f73922254
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d527g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d527g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61020f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf128aa2e04ab1358a2c6dbe2426cf9fa468b43fdbbeaf4a52aa04c2046935945",
+                        "s" : "0x54e15e201fec91621ec0130bd6af87d09cbe7e1876e918408faa2c1f705eeeff",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d528g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d528g0v0Filler.json
new file mode 100644
index 000000000..84875c3e9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d528g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d528g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102106064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x15932f2ef77f6a99f45f31ed8c55fe6e659f4df875847247f8a0f4def7a0b39e",
+                        "s" : "0x5622806f2b451285d377d5e5f747d5c31d8a1dd3c5f5dd4ccf672c981c9273ec",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d529g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d529g0v0Filler.json
new file mode 100644
index 000000000..9aca32f87
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d529g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d529g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102116064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x11b5aed4ba416f13f703b23d541936a041bd60a3a0bfd6dcafaf1e11ab2dfa",
+                        "s" : "0x099ba1e46fda1231bd35f1475a4e0fa357d08592b22af1f534f9805bd0a109c5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d52g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d52g0v0Filler.json
new file mode 100644
index 000000000..c408b1356
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d52g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d52g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60346064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x56b7149dc7e51436eec85fca3975a7b9e74ac77a759e01c3108fb79a489789dd",
+                        "s" : "0x48a3f875d419137d6d5accf5d42e7286685d135dddba7e4e6b71da9de2364454",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d530g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d530g0v0Filler.json
new file mode 100644
index 000000000..9ab10c7f9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d530g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d530g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102126064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf739bc04b11f115d3fd97d32ed3f25de14350e350508a22adb2d1066dea34415",
+                        "s" : "0x671b7a7ab7c787ec9601a65f0d9aee54113c0a4e0ad180384ddb4f456ae4a83c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d531g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d531g0v0Filler.json
new file mode 100644
index 000000000..6dbb0a470
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d531g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d531g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102136064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xde8a4be59eaf54968540decbfc170ac29cd6e9e8837ff63f44a4993b62eae3a4",
+                        "s" : "0x7727d34c5445a930e2175892e8c1dd33f90ecf43b75704d5633de1cd7a1654a3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d532g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d532g0v0Filler.json
new file mode 100644
index 000000000..db5896bd0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d532g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d532g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102146064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf3579746325e61f727facd8bda6da004c62c54813e073b5e334261556ed7468b",
+                        "s" : "0xc1cbcf446e66b7dacf3f24405b7766e07673cfb2bd4c36a1dbb1ca41f60d64",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d533g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d533g0v0Filler.json
new file mode 100644
index 000000000..0a60f207c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d533g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d533g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102156064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x46e38f781727e736614c54c28002bec6271bdc2bcaa1e86f7e72b306b3710a19",
+                        "s" : "0x79fdcfd505a8f1e5295c8c49813ef9936cf8066a782caa5e54268aa51f31a6b6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d534g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d534g0v0Filler.json
new file mode 100644
index 000000000..3fe409def
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d534g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d534g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102166064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8393b1a0877f7dee3ed626702a490cced80b89b887a311d127a0c24bc08bde63",
+                        "s" : "0x26129aea98dc1473520975489ccaac4d602a9222281dba3e9b032a3c7e9d0c0a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d535g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d535g0v0Filler.json
new file mode 100644
index 000000000..f4c216906
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d535g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d535g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102176064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x62ed5f9aa18e14cb66c3df0516959021f99b553f1646957e4f2d503f65c191ae",
+                        "s" : "0x7fab3ce871a15e7085c456c276371f25f327684e179b0a4400fa2449d911bab2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d536g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d536g0v0Filler.json
new file mode 100644
index 000000000..b8421cd82
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d536g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d536g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102186064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3f6227fc2166e58f38cf2be7baed50d7b017c17efc56b21a464ee4c0d2932216",
+                        "s" : "0x253c7b1b4de631512fff77fafd385f29dafd01589e56cd74bad4ca7fcf9d027f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d537g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d537g0v0Filler.json
new file mode 100644
index 000000000..77ba71a6d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d537g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d537g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102196064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x960345bd64e784abf17224575a06a66f44ce9e6969d61762cd570aeb6c5240e7",
+                        "s" : "0x4c286cb8156ee59a3a1a9a2066cd5cb50d79baa69716432b8e8f0d3f26a4977f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d538g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d538g0v0Filler.json
new file mode 100644
index 000000000..03ca3c641
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d538g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d538g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61021a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4cfd94d5867755a8d01f62352f55a5fbbd9622a0c34af2d6879ffb2741ee9ccf",
+                        "s" : "0x2c8102ec416a87132077530caad5b20b659b63afe8647472ad1c11c79cd57fa8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d539g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d539g0v0Filler.json
new file mode 100644
index 000000000..c9db58b03
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d539g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d539g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61021b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe26e97edd8fa4e745f9258671c99ffebdd2614aa8583cd036c5fb62ccc6f6947",
+                        "s" : "0x49a211bd121db3615b233c0b3c5e0307601761358a5a9a8594ab49bbadd82e86",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d53g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d53g0v0Filler.json
new file mode 100644
index 000000000..6032dd273
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d53g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d53g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60356064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x34a53e4286e471bb3f9e555f89410bff5c9a328fb5dce2f0c05d4a8fcbc10097",
+                        "s" : "0x43b9fe2bfbe702f636b46609a5a562d45ad336590d19d71e773045545aa40510",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d540g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d540g0v0Filler.json
new file mode 100644
index 000000000..e4f1c44df
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d540g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d540g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61021c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfe44a1e446b0b276a232df06aaed32b5c7c261a7b9fa22fff9baa772cdbfcc64",
+                        "s" : "0x455f90bbe476ab67e4d24d0a17894d15f1cfa0b377b520dddf8eb40a80590667",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d541g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d541g0v0Filler.json
new file mode 100644
index 000000000..3c7cdc161
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d541g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d541g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61021d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xed725616d0a0a1e052e6c2395c5a803348ec0ef85dbe8715b5783f1e69026906",
+                        "s" : "0x1c7ac5bea51c22fc4b8fbbd0fd295dbe40c76ec845139f478b701d0ce2d444d4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d542g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d542g0v0Filler.json
new file mode 100644
index 000000000..ea0529b9e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d542g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d542g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61021e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc3674ee5195437cf71d0bd9cb27860fb85fabe52aa36a7b6bc6163ba751ea3cf",
+                        "s" : "0x1d256d56d85b8fbaa1068b0c801a4cd2b76a4ce6e2acd13510fa6ad81ad66d63",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d543g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d543g0v0Filler.json
new file mode 100644
index 000000000..1c0bd9a6d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d543g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d543g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61021f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6070520a3a9c68382ce7c23baea89d143000f72a9e389b467910164b5efe598d",
+                        "s" : "0x4243389430279e962ff49a39bb8ef3bbe2e08f9b9529dfe8bed3639d1e56bf09",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d544g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d544g0v0Filler.json
new file mode 100644
index 000000000..54fa6aaba
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d544g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d544g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102206064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2baaeda4541462452bcfcb9ebfc82efe7d80f187cac6528f7dbaf9c5644028d9",
+                        "s" : "0x57b067f2be983a12fd55a3d5ea5a741173d7adb2f9be379107e8e74101bef598",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d545g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d545g0v0Filler.json
new file mode 100644
index 000000000..69676a6b4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d545g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d545g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102216064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xce3e87b856c05f503065cd8b2f677334ece822f06b085eaf7922f5b229d11e41",
+                        "s" : "0x2f70a566f85a0b59a308488f6a1bcfd51c1a62d300461f08c0d9cb415cb0416f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d546g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d546g0v0Filler.json
new file mode 100644
index 000000000..c48e2f3c4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d546g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d546g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102226064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf1df2c6f5f19deeba50ebbec6d912fe5a01f05948d4eede0167b20188e75d8c8",
+                        "s" : "0x7342b9abcd0c591c973cccc46bd83a19635e5f72f3248560af5d90dd4a53d82b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d547g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d547g0v0Filler.json
new file mode 100644
index 000000000..7a9c09093
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d547g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d547g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102236064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1d6760ab2504f9c100fc962f3464cc906a0e22c8fa6269d476c3d3559f6ecab5",
+                        "s" : "0x6d6079be658232c3d7c0277395e79a019312718198ae9c6a9a4a1b96f28c45b8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d548g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d548g0v0Filler.json
new file mode 100644
index 000000000..9a11ae1c4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d548g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d548g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102246064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbbee242838a507dbcc6cd2fd75b934ef8a3a276af45612e3a083a2753703cae2",
+                        "s" : "0x4a14c0fd64143b917dc50866c4109d08a376c521677fc5d49b86ecfe77b62578",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d549g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d549g0v0Filler.json
new file mode 100644
index 000000000..cc27a5bfc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d549g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d549g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102256064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x53e614b4e0594100b07e35ce9547f13d555e214aaa1e22f2c7e5b21edf14a691",
+                        "s" : "0x162ab629531dc11bb7af85773b05589ca3ee1211d74eaff01552418a96d556b5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d54g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d54g0v0Filler.json
new file mode 100644
index 000000000..c041211ca
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d54g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d54g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60366064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4f12d0a297bae58a994d6fc3e4027483c076b7e63499fabc301aa7d8edc05448",
+                        "s" : "0x745f088673d14c78cb6648ad2776dd03b07b47835201603a63a8ef1a55887f9a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d550g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d550g0v0Filler.json
new file mode 100644
index 000000000..e88f7d9a0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d550g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d550g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102266064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3a2ccadd81021bb810c9e79012fa3dd0554e09b743620048f417c0225475f4ec",
+                        "s" : "0x5b99995e6431da7d75eb2cb4f859d60fbe5cdc2fcafed0561bb20acc9f51c14b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d551g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d551g0v0Filler.json
new file mode 100644
index 000000000..91a12e421
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d551g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d551g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102276064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2bb4347a075ef3bbe6986e26a660ee72ebe6066454e38df21ab6f5c8866b5144",
+                        "s" : "0x1eeb0f11591e3d02dfa9373927b2cd5f1c9be8aaa829fa8dc7f451c8c0fdfd64",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d552g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d552g0v0Filler.json
new file mode 100644
index 000000000..2978128f3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d552g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d552g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102286064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa1e76f2e4d08541922b60636fc60bf122aaa672359c2d97f363a7142776b3399",
+                        "s" : "0x5d3dbbfadb7a1d74d7def9577386599cf85736b4c78256698408140241a00c11",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d553g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d553g0v0Filler.json
new file mode 100644
index 000000000..b42d91dd1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d553g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d553g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102296064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x20c5cfd74bccc5337272bfb0cf2e031c254c7bfe59a2cc80613b75413568757a",
+                        "s" : "0x0f3fe6597a8306c908c4d52173dbfefd2e197e720d4e85ddc45677a67729319d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d554g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d554g0v0Filler.json
new file mode 100644
index 000000000..93e9bdabe
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d554g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d554g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61022a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2b77436c0ba07d9d8a77bf093d8af3c63fb0a492a54570c7376da069b40f75dc",
+                        "s" : "0x3e15002ed24fd6623160a5bdb3d5ffc685a2b4d8c29a02dd2d31bf644117df57",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d555g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d555g0v0Filler.json
new file mode 100644
index 000000000..6c8375dc7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d555g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d555g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61022b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x77bf926884c43f3acfd3b4c53a8cd36728a68e14de59209e754d92f60edf957f",
+                        "s" : "0x2db775947f2582d1dc9347011dbe2a5423fa41cf95076d5ac3d5906994e4005c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d556g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d556g0v0Filler.json
new file mode 100644
index 000000000..f80fe51e7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d556g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d556g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61022c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6a96466a4b6ba0ced82a709b6da5b24519eb2b8f8ffb390ed6bf326afdd734a0",
+                        "s" : "0x75d0d7f0a88b49fb9534fd4e64594f101a1a10602adb4478ed47b95730072ab1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d557g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d557g0v0Filler.json
new file mode 100644
index 000000000..3b543489d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d557g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d557g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61022d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6d66eea24e9b9ff27a7976e3ba6325b114b4f682d44df4b8d678a024e14b8c81",
+                        "s" : "0x54e3954d5338b118aaefd4f935e58766e03241f9177552aed8d5d76bcd3be903",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d558g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d558g0v0Filler.json
new file mode 100644
index 000000000..244565383
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d558g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d558g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61022e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeb7131c4d3bcdf24c83bce7fd1fea3921c6246474f969b6dac671d17e52f7cde",
+                        "s" : "0x73eed8759bfe5e5e1d3980a6c477a119752c694595f8be45257f75a9d6202238",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d559g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d559g0v0Filler.json
new file mode 100644
index 000000000..41ddcf601
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d559g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d559g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61022f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbd21085c79a28cb6716b084ca532fa0ddc4502e5a19f450f771189bc7cfa1e99",
+                        "s" : "0x36312555bde9fe431a7fe7984937e6ed8de7c6edcf2d03a939a801d3897e616b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d55g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d55g0v0Filler.json
new file mode 100644
index 000000000..abd16eeff
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d55g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d55g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60376064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x42f5b55ca31c94122103728041f93c08a43666d33e93255692050a9edbfbfe9b",
+                        "s" : "0x7c8f0eb37ba172d6001411d26d34059400d15c6801b297523906226446891a11",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d560g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d560g0v0Filler.json
new file mode 100644
index 000000000..624606ffa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d560g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d560g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102306064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0c3f690c557a59cf430e14b3682c4e5e60939607c85d8dab2f8ad9762c3dba7d",
+                        "s" : "0x31494b3d6f42356e1692acd055d11907c36cd35de728ec1fd8a27a2e35d57781",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d561g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d561g0v0Filler.json
new file mode 100644
index 000000000..70542b394
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d561g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d561g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102316064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xce4b7aa87d67a24eaa92a11c82d864b404711e426f658a95e573c4b9291040dc",
+                        "s" : "0x70ed12844f5347f57d18758848be6b74d9b63fefafaf5b5aa8e8ffb200baefe0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d562g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d562g0v0Filler.json
new file mode 100644
index 000000000..fd8ef8565
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d562g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d562g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102326064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x509d544e744859046dcfee5781fdd44299db1ce4c3406ab881589279e9d85bc8",
+                        "s" : "0x232def2df0a23a2418c3fe0d7d33e78dd1e71cd0176f176aa25e00015212577c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d563g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d563g0v0Filler.json
new file mode 100644
index 000000000..6a947c510
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d563g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d563g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102336064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4fa79e803d69dc28185c123a3d2d9aad9abb6723d8791928e668a08aae9c0deb",
+                        "s" : "0x64b4288a42204e4aa3a877391d40ea3a6070b870c375ab303d7de18f55f79194",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d564g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d564g0v0Filler.json
new file mode 100644
index 000000000..d565ac360
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d564g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d564g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102346064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4869b42f96fef5982d006159b410fe9f42e2f1ab5455043563ad920f3eadc224",
+                        "s" : "0x4f965cfb267eb009f19dfb7eca65b75d45984544e900163b54c42ad6ff03fada",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d565g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d565g0v0Filler.json
new file mode 100644
index 000000000..28552c59a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d565g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d565g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102356064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x74a3ecc1e32f9fcca8e44a7fb2eca6a808e07d4d96e7e98ca3434f7895fc8dd2",
+                        "s" : "0x7dd93234415b767d4368a7c9a3b269ae3a54572db46e62520ab9e71124ce7afd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d566g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d566g0v0Filler.json
new file mode 100644
index 000000000..5d7621d91
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d566g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d566g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102366064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82102c90f26f8c41663d53a8560401af343e71c401e340f8c944127e1d59d84a",
+                        "s" : "0x0884e93525a1e5314eaa0bd5b8b55ff444612858441750407a28d4f549b3db74",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d567g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d567g0v0Filler.json
new file mode 100644
index 000000000..5b747a321
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d567g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d567g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102376064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb3c8a34635c03bd7307d3b829a33654a85064c7cd7bbccd7e29465c89d7b0112",
+                        "s" : "0x51f34e46ab015d219447edbe08a070520dc71ca18ecd1312e69c7db779260ed1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d568g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d568g0v0Filler.json
new file mode 100644
index 000000000..5046bb3a4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d568g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d568g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102386064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8db88a5cfe22a0102a7d784fe11961b3e898c70a16b9a957c4899f1103e60e10",
+                        "s" : "0x4be58a7917dc8292614af2a69c5160b664ca5ea80e07abf250770d1c578a36c4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d569g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d569g0v0Filler.json
new file mode 100644
index 000000000..7a30e8c43
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d569g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d569g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102396064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3c409796dcda2e9ce327a2e2e2b61b3804c608cc315f91dec0328ef530cae54a",
+                        "s" : "0x7b04ef4839999cac2160811947aa945e63b221021d6bbfae698f4398f5d72d9c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d56g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d56g0v0Filler.json
new file mode 100644
index 000000000..e916bc379
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d56g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d56g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60386064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd9123bd2db1583bbb16eb90b65e31ef8cebeda5cd30f48e85ed3296ba43f68d9",
+                        "s" : "0x71bf191d2a19dd3857b3da0144b86ac93706dbc485085e94e8107b4138458000",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d570g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d570g0v0Filler.json
new file mode 100644
index 000000000..ca04f9061
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d570g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d570g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61023a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x694441d7bf97c61e04b5e4a423cccd8fd24b81bf44119ba7a2581fc8a6c338a9",
+                        "s" : "0x4003eaa97dd7893e8ad936bb9a3f4b6f5416edfa10c6fb566b11cde3c2b68b2b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d571g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d571g0v0Filler.json
new file mode 100644
index 000000000..8b5f2b550
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d571g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d571g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61023b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf898387af8b5e8bd0fa924bea8a8d4fe72290f33c73ab53f101180ef070ece99",
+                        "s" : "0x6a5814d941320eca86e383a7783b29051bd3c96ca05b7e7ddf3288565d68b147",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d572g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d572g0v0Filler.json
new file mode 100644
index 000000000..a3cd0a87b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d572g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d572g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61023c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7c4d869a0a68bc5bac17a395a6a05bce47d32348dadc78b78f9afc8012707840",
+                        "s" : "0x37fc14408ab12f1a97ab9040a1e343b1f97b9aaaa1d5e94e46631de73cbba62d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d573g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d573g0v0Filler.json
new file mode 100644
index 000000000..b9cbcd78b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d573g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d573g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61023d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1198623c98d06b155e82d7b398e29995aa6a2aa7eaa79d048da44d4fa5ec463d",
+                        "s" : "0x4d613ceeedb6ffac8b4ae32d1f7db8a2fa0140284afbd9a5b9896e9e4e1855c9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d574g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d574g0v0Filler.json
new file mode 100644
index 000000000..ee62e1d4d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d574g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d574g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61023e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc08433f6854cf674e01433299e7c8ab8955ee1622ee5a4dcf4948d602869779d",
+                        "s" : "0x6fdc3d4a0f1c183ce73f10551939cd75a1dcc7350a354cbdd33d4b08e2ab247a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d575g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d575g0v0Filler.json
new file mode 100644
index 000000000..e3b8cea7a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d575g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d575g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61023f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xce4067416e1c2fef418861a5a380818fe2df68fcf022d925b0545f4f4b459753",
+                        "s" : "0x47b7514bc899985395839873ed3dd37762388468c94bcbc3fed46bac4f671e2a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d576g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d576g0v0Filler.json
new file mode 100644
index 000000000..a3abb3748
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d576g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d576g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102406064526000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x422554acdbbb64fe00ff860a8fdbbef8296d7865245088d36edb01f92b4457d0",
+                        "s" : "0x2bc1ca7075e1b01d5e636e31d03970ba4f0071ddcc4a44eebf9857d49ffc9c26",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d577g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d577g0v0Filler.json
new file mode 100644
index 000000000..3d1eba4f1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d577g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d577g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102416064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf8fbf2f7872eab7836beeadf32353606638e87765bcea6d28150118eb6ddfa6b",
+                        "s" : "0xee809f028dcda8f192fb993416bf8a02e3ef3d23ba42e7c903414ebd0d0763",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d578g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d578g0v0Filler.json
new file mode 100644
index 000000000..2e29174ed
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d578g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d578g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102426064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x27376db344f5b73a488dc6c0129aee1848a76e61a40820acf9574f8dbe2fb7da",
+                        "s" : "0x531dd928fcd6b67f7c388e83c7f0a7dd39c228534b084ad6d4ac1fe3ad3df8b1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d579g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d579g0v0Filler.json
new file mode 100644
index 000000000..ec995a4fe
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d579g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d579g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102436064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd7dacb10660454a6cc6442be840e69e19cdea96e6239df61b2d233713a0e24a0",
+                        "s" : "0x29bcdd949c4a909348ca6ab513e3a79e05c1597ad67288270732b5408d051b01",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d57g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d57g0v0Filler.json
new file mode 100644
index 000000000..870cf6c2a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d57g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d57g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60396064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x41b884738f386964629d1abbf8cfdeb25ee91a02b440d617e2952b5efe918ca0",
+                        "s" : "0x2d0e3825fc365de5cd32e4fd9343e1c077a18382d8a407d8219764a5cf915c77",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d580g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d580g0v0Filler.json
new file mode 100644
index 000000000..00691694d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d580g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d580g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102446064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0922d9c61356c188d534114c181d5c6c929600c322ad503c364e59c2b4bc7fb8",
+                        "s" : "0x4b6a02e2e0f64d78ed6c933ba4ff1b9f68d3ca6ac449de8a4cbf16c9516b1a92",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d581g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d581g0v0Filler.json
new file mode 100644
index 000000000..05d151304
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d581g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d581g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102456064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe1125bc26cf78744dd15a2096fc46674f8ceb1432d01bb8ed863cf04c57637cf",
+                        "s" : "0x2c169f36f7f7dc0fb0cdbada7b91296423346119b9e172efa131fc484c463b4e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d582g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d582g0v0Filler.json
new file mode 100644
index 000000000..9bf09c4dd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d582g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d582g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102466064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x646e44a9c9ba86699095197d8f84d73910b10c0bb18e9ef7201c895e022ae37f",
+                        "s" : "0x1920f5889c4ecb702e9f16c14d7685184c245875c243e3ea9cc289e685c055b2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d583g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d583g0v0Filler.json
new file mode 100644
index 000000000..c1e27bc31
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d583g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d583g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102476064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x72cc683125ec9b8134a58b7302a19ccb131a5740724045fcf7eddc05f2da938d",
+                        "s" : "0x59f01b91cba3126ca7403dbbc5ed74e928e9501c2c65dc2bde1182161eb1b91a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d584g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d584g0v0Filler.json
new file mode 100644
index 000000000..8cee1bdb5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d584g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d584g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102486064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x438a3a4c4020d0c914e57453f08ded51f5497dcf4b7d7a3c97cc6f3b48f22946",
+                        "s" : "0x3401331a81dfce4ef8106a304da22f305961c86efd9a19a2784ef1f51e5e2c17",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d585g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d585g0v0Filler.json
new file mode 100644
index 000000000..0ee46aa0a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d585g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d585g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102496064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x56e75c91cc9b4a37d8b39b9573482a43c5d4b46a0d131acc03ebca3e2b01830b",
+                        "s" : "0x7345e6aeae524d97dd9d10b75493f5f94b2cc4b00861f988123bf02da9ecaf99",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d586g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d586g0v0Filler.json
new file mode 100644
index 000000000..6bc5f5c5b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d586g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d586g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61024a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5477500f2943ea41667284f644acf76b35748d4e704862dd9e9047ff4cba1a6b",
+                        "s" : "0x18ef67f2c5d09d4243a98f03dd73d1abddff90ddea8eb409774b859c522e2772",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d587g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d587g0v0Filler.json
new file mode 100644
index 000000000..e09f02ca2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d587g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d587g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61024b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0bfd7c22abe508a7b6843bd0f2c25a386b45c2c7f03ea911dfbd4f298860aa66",
+                        "s" : "0x39078d563ab77ad629d4232234b728641a365b806caadec36674f38edb648abd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d588g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d588g0v0Filler.json
new file mode 100644
index 000000000..539836248
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d588g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d588g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61024c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1eed8ff7ba46af6b7873e41d0579a730c3d34732c6f30d73936753a18cb4f00a",
+                        "s" : "0x02b3764d3a247b0d3eaf0c786d6f605cb629283bb3fd1a3cc32dc1fcf1004cf3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d589g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d589g0v0Filler.json
new file mode 100644
index 000000000..4fd548846
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d589g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d589g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61024d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1dba21c83a0d2d53b440281926c9e1b565a093b1ecb03030dced8391e801fe86",
+                        "s" : "0x51a80a31e9a42f2402f371ef4cab2fe35635b90a4d39109e59764fa0600b1a6f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d58g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d58g0v0Filler.json
new file mode 100644
index 000000000..296a3af2c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d58g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d58g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x603a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x681ac5cbe82f4112cfc8f5c8b0161409f55880c799757d72303babc68f32e04d",
+                        "s" : "0x027487a1b375c9e7a05232a20dee1d35c74242efe957204a60639879408b700d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d590g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d590g0v0Filler.json
new file mode 100644
index 000000000..addd5c99b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d590g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d590g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61024e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x37d1392e11535228f2385ba7be9a3d0fb01d4d7805939c885100a30533ee77f4",
+                        "s" : "0x6a17cc713987d66bbf96323266c90d98d810f08077bd41891fe622123f7ae129",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d591g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d591g0v0Filler.json
new file mode 100644
index 000000000..e9de80517
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d591g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d591g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61024f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xce08a9966ee2d62b034952eb4204f11b53912ed78a801a7949701b1cc51f3f7b",
+                        "s" : "0x7a21443a348f80fdc5f197e2f64b7105b8f8f4d118c7edd2e9088c90c0960f09",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d592g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d592g0v0Filler.json
new file mode 100644
index 000000000..719884e63
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d592g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d592g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102506064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x495c6bf1fcbde8a2507fa380783f7c6ad11500185f2d1d2a77602f1e1ac80a26",
+                        "s" : "0x2a476cf4df43474a2e8437d444c9ae5316b27e4587015fc36034de6ece98d448",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d593g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d593g0v0Filler.json
new file mode 100644
index 000000000..3f34c9098
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d593g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d593g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102516064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcd6f6283801f253d3d1e78fc1b4a3b586e5adf83a368cdcecc1745ce4feb4618",
+                        "s" : "0x615ecbbb5ce7cff83d9e9af05f10c478bbfc4d004e8ccc895490d306555004f8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d594g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d594g0v0Filler.json
new file mode 100644
index 000000000..0e22a4a88
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d594g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d594g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102526064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7512ef03c48877244cd272422c4bd99590c3892abd9decc9793e42713b356650",
+                        "s" : "0x30fda9a95d476f5b3b5262e891006844163f53f509c036636430c6e4e114839b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d595g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d595g0v0Filler.json
new file mode 100644
index 000000000..e57b9ade0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d595g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d595g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102536064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x826d155c0a5c808c54b501f4a9c6621a195bb7a701a4432dda4438144d5b671d",
+                        "s" : "0x0b0992cd8a86cfd1c47f295df8077c45faa7f7f0cda5e82e1c0d3c2317c74dca",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d596g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d596g0v0Filler.json
new file mode 100644
index 000000000..00b4bfca0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d596g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d596g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102546064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xca4eed193356e9754609cb22aa331efb287b3c800df8660ac1349ec44a47a3ed",
+                        "s" : "0x250e5ccc1ccc3d94198fa8ea24831d1a4e7ae2094bc799fd1432aa26b0c5159f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d597g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d597g0v0Filler.json
new file mode 100644
index 000000000..4ffb75234
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d597g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d597g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102556064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd02401f1fac8ab51385a290ea57cb68ccb3e5178be4f857f85febd8286c529ab",
+                        "s" : "0x469e5c50ef0d343622067f3b443ffa85a86247eb54e87b23e7e1039c1dc285b5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d598g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d598g0v0Filler.json
new file mode 100644
index 000000000..2fef29fac
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d598g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d598g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102566064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe55a761fad6183188360b476a98aae8723f06aa96f5017584f575527fa17d51d",
+                        "s" : "0x7d4afcad659fa820d1924b663268c715d98330fae859e14b23e26f18b65bec57",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d599g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d599g0v0Filler.json
new file mode 100644
index 000000000..3f61c0d8b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d599g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d599g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102576064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2c4ec7133dfe8d364b02071dab925337f4d28ce4edf7925a4a7d803e553881f6",
+                        "s" : "0x2eaba185fcef22f720277eeb7e0c05f82ba27b5747f18345d29c756d7e1a27ea",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d59g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d59g0v0Filler.json
new file mode 100644
index 000000000..8a0440b35
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d59g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d59g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x603b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6ab614f70939221e62a7e562d1c18c35c33b7ffebe9432abcd8a55af20fd7631",
+                        "s" : "0x385d0947425eead84be310e4a14f26139a6a8cbc28dfd2410083d8cb24ceade3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d5g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d5g0v0Filler.json
new file mode 100644
index 000000000..ac0f1296b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d5g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d5g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60056064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4e0aa02ae84b0a9930f00ce94b54a1ff0a8bd790a6639e440290af6945998668",
+                        "s" : "0x271ef4e26e21c2aedb24890d669fa097337bb94ed364d0534da7fd49356a240e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d600g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d600g0v0Filler.json
new file mode 100644
index 000000000..c957f1d9a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d600g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d600g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102586064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc88b1920cbca8aec11652a2a9eeab3b06092a3823dd7403ba1cb06e7dae14f58",
+                        "s" : "0x7bd32db635c8d218692f8b850421ada7dc7f3f5c08fc2c3137ddde31c17a007a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d601g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d601g0v0Filler.json
new file mode 100644
index 000000000..5475aa06f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d601g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d601g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102596064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x23f0f7de52aa14b4c11c9688d631a55673a177b6617b8195f74e7a9ca7cdd43f",
+                        "s" : "0x683df58ad8dad9c87b4971e5a273d3787feca93d3c8c07679c3fc4b4fa894c70",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d602g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d602g0v0Filler.json
new file mode 100644
index 000000000..d2b9317a2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d602g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d602g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61025a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x321d033b02b35eacc02abdb6e729ad81e47713cc65bb28504fbf4396bb6c8ba0",
+                        "s" : "0x5f8a8a46929bb7324c7e7c1fa7282ccd0014234c962ef3bc5a57ae8327c67c62",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d603g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d603g0v0Filler.json
new file mode 100644
index 000000000..78225434d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d603g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d603g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61025b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5a27b3d9f427d8d91c3d27273dee60ff4c49a8bf62e72dc876198830795f2b92",
+                        "s" : "0x3e75feaec67b7e9c68da2948bd8c3015571c784fce2d2f1b875400364c28281b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d604g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d604g0v0Filler.json
new file mode 100644
index 000000000..058fdf0dd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d604g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d604g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61025c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xee7148ee01b9f09bb0569defd77c88d09d9a2f35a5f412603fcb8088a0112777",
+                        "s" : "0x2e3df1d8b5e91574a01bd1204f39de55046aca58aa1818655cadbc7e4b8cc076",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d605g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d605g0v0Filler.json
new file mode 100644
index 000000000..393ad81b0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d605g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d605g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61025d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7df4fd1cea586c88dcf7e140ad31ac8a5858ed508f4ac778a67a96d5b55a46e6",
+                        "s" : "0x1ec37950e857fe3cdd9e7b4311802077a76e2f97a02c0375605d30a6f3c14151",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d606g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d606g0v0Filler.json
new file mode 100644
index 000000000..951eb94c7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d606g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d606g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61025e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb314ff5b68e9ba3d3dd473b88f966d3a0619484e41959e55059bde7a578aaed6",
+                        "s" : "0x2593303e966ee87522c8ed4245c18a0cd6d23b8fee34ebd1f2272d1911439504",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d607g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d607g0v0Filler.json
new file mode 100644
index 000000000..fe1f29451
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d607g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d607g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61025f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x143faaf19e7dea7b9e8356b089165352048005cefd38cfc64c639562aa2bd915",
+                        "s" : "0x23a3196f7eae6db2c082aebb904894a5d8a40ffc68a5548bbc0601e01a0973f5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d608g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d608g0v0Filler.json
new file mode 100644
index 000000000..32b315481
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d608g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d608g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102606064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6ce15432f2fb2a25c1baa16931fd4c0b8c62e58a096d7814cabb046676499b86",
+                        "s" : "0x7d64ef718c1137639a2340655a4df1f1853a15626c36565150ddaefa237c39ae",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d609g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d609g0v0Filler.json
new file mode 100644
index 000000000..d77c05fdd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d609g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d609g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102616064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcbd5e3894d27583d0b9aead4af53544595fafc28c37b0564cf5c899a0cfd3fd1",
+                        "s" : "0x4170e6c4bed8195a65f32f5ef4bd94e2cb31c8ca62be02e0f70c989c3224a8bf",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d60g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d60g0v0Filler.json
new file mode 100644
index 000000000..2d720bd35
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d60g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d60g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x603c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x42e88d28c1e1d3100e4d34243321b5569c0dc7fdc08176ce857ba6d19b090cb4",
+                        "s" : "0x43aa238f84f65094da4849c5eb2fc7e6c57bc2c9ca39670f4eba7a87e62377b8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d610g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d610g0v0Filler.json
new file mode 100644
index 000000000..5fb424f08
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d610g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d610g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102626064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x308e8e226295cb81b666209f405d35d53ae4170d18b23ae61f70b5ba61ba6791",
+                        "s" : "0x44b8d9848adb1a9a98f04c1ccc0329407da942d30deb104602f871aa9ab8c1d5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d611g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d611g0v0Filler.json
new file mode 100644
index 000000000..601e1a947
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d611g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d611g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102636064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x76eef873cf1069429f03d8e3522361176334aa56f52a6275ed3440e36ea43b32",
+                        "s" : "0x0d4274d4935eab47a2d15b5d5d42f36fa530fd3fe8e674265eef4a32be9b1e68",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d612g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d612g0v0Filler.json
new file mode 100644
index 000000000..2f52ca1b2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d612g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d612g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102646064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd84986db91705a7fee467b57fd7813357ae6b6a9faf4096d43dd49d29506f2aa",
+                        "s" : "0x4d6c4aae14feb2730b36cc5b7c04a5965a28874878a40718dcb944352d65a249",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d613g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d613g0v0Filler.json
new file mode 100644
index 000000000..dbd7e8928
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d613g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d613g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102656064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1ec0a91998c3da87913c61cfb212149bac8d689b2d628b9c1b895025f94d9c72",
+                        "s" : "0x313f56c7b705053276150756fd66e43f25895955cb828343efe031276485eedd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d614g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d614g0v0Filler.json
new file mode 100644
index 000000000..d1a67b678
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d614g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d614g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102666064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x16a34cbde68a1df43310491724b3f649751140956b813b4acef301d93e558daa",
+                        "s" : "0x50bfd5f30bd4b2afe6fa5d728b046f1e6b5c576d6912ebe6f1bb079c446dce2c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d615g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d615g0v0Filler.json
new file mode 100644
index 000000000..87a2a8a72
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d615g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d615g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102676064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x61592733226079bc070341adc956f0063e50cebc7b8f3624a3f171174155b2fd",
+                        "s" : "0x45028c901183ba42677343661569c5f6a7a9f8ad39e37c6fa20563642cf2c88c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d616g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d616g0v0Filler.json
new file mode 100644
index 000000000..5735ec7ea
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d616g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d616g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102686064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x850a9a2c460ea6d0aa1ec6acd4a10b8e084584d4991d5b0bae0c8015cd31bc9a",
+                        "s" : "0x36fbef8959cbd128d362e98f0047ee4b37fe07fbcfabb37a1179e4145a9ca551",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d617g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d617g0v0Filler.json
new file mode 100644
index 000000000..6a951d40a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d617g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d617g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102696064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc52b54e16d06b61357fc9e0699142f3855f98a90748b2318fd6ec74346a1165",
+                        "s" : "0x316b16b0dd424d64ee8f5f065bf6c729c264ff57ab0842e0326e6fcd0cf503d5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d618g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d618g0v0Filler.json
new file mode 100644
index 000000000..bb86f7f4c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d618g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d618g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61026a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0101cdea92c95aa189d532a887eabe153a694ad124bca6bf00732df80532b0c8",
+                        "s" : "0x73ffc3acf4c70c81e7eb58320bbe41c22b42a33f2bc7028ee161526fc00048cd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d619g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d619g0v0Filler.json
new file mode 100644
index 000000000..1d97ac771
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d619g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d619g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61026b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5b068d063fadc02e749bb38c3dd533b1ae7456c126c8ba337051ab23294ea1bc",
+                        "s" : "0x23c2d839f3fd7d068d907302919d7063fbf607afa77278ddea206497f1d262f9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d61g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d61g0v0Filler.json
new file mode 100644
index 000000000..0e45623b7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d61g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d61g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x603d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0c869a4b8f17201974fc57a0c82f75200b78742706284863b30d89d38b36ad3a",
+                        "s" : "0x136f307e96f5f5b634219cea5eea71663e83a7af573d863494eb300d3c82eecc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d620g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d620g0v0Filler.json
new file mode 100644
index 000000000..93cf3d899
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d620g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d620g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61026c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6eafc662f42f9b79b4098df3e3bdb2ca2ba6a3eb5ec251fb2d740b9cc1606644",
+                        "s" : "0x4f2c6ed932ce16c29cab25f2b4b690ca0ddbcd66a1bb51c7165ff2adef731f03",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d621g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d621g0v0Filler.json
new file mode 100644
index 000000000..ccc016a0a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d621g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d621g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61026d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8ff7b6385f8a25fb07595513435e4718145790b0a837cded57fffa6b40407c52",
+                        "s" : "0x43cb6255f7ba6f6b9969ed357ebd9613e0da545822c0ebcffcce9a6b0096f332",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d622g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d622g0v0Filler.json
new file mode 100644
index 000000000..71ebca5b6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d622g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d622g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61026e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x437e1def3e7db15c97160c0a42ef0c1f3a7d574201e022489ca030dd091ca43f",
+                        "s" : "0x0ac36a056907617b932f682d2a8a6ceee55989c4fdc4a9a59e07f9cc19666f4f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d623g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d623g0v0Filler.json
new file mode 100644
index 000000000..a80bae633
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d623g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d623g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61026f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb9db370bd0b1a45fbe1bebbd2d6f1cdb9327d48d43ecf36c0eb4f57633ce0aa4",
+                        "s" : "0x593a85bcab7b9569cf279288c531701386a9dbdf4ca29e66de47da499b245018",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d624g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d624g0v0Filler.json
new file mode 100644
index 000000000..872eaee92
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d624g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d624g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102706064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc170a84b76f3eb2327bb1be2b4fb6b842a514d09742d7aa8a670f74a416db5a4",
+                        "s" : "0x4cc815622dcaffbf3c240aaa792ef54f02e16c3deda27c44c0d35e5d35edb0e6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d625g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d625g0v0Filler.json
new file mode 100644
index 000000000..cd8fa169a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d625g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d625g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102716064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5eb84bdec9da16729024abaecb2d4d07849105acaaaf53deb0f25d9ce11498a7",
+                        "s" : "0x31f39c407c48b19baa29f74ec5e126ce3fa1df3b247fdc6d0ff183068768f87b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d626g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d626g0v0Filler.json
new file mode 100644
index 000000000..76739600d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d626g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d626g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102726064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9577ed03452e474a9e81ab78a50f366c672f4c92ec7847fed7b795ddcb3af976",
+                        "s" : "0x7e1cedde15c5975203937e76c1bdecfdf0cb8a3bf22a6bdfa21126ad3785e850",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d627g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d627g0v0Filler.json
new file mode 100644
index 000000000..bbe8a6d7f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d627g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d627g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102736064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2919415a013c3387986e9d293d5853a3249015a678d53fec17837bc441e190e8",
+                        "s" : "0x6fcf8411e3116683e94cd557403858de47e390efdee6f639e57fc47cf34f6b4f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d628g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d628g0v0Filler.json
new file mode 100644
index 000000000..f63b861a5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d628g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d628g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102746064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x560c9113afe7ef270109476faa91744f08b4154db19cf5a72e3cb26ec681b067",
+                        "s" : "0x75d93f0f74e398bb2d33f5604ef1d81607cf2cc6e59473d9b62212972f1629f1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d629g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d629g0v0Filler.json
new file mode 100644
index 000000000..772ae50db
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d629g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d629g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102756064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x52d83cd52751d709595279ff7cc26df75f528d1b83c82ff4f04090b3b43bfb08",
+                        "s" : "0x5390266a45a1ae6b523752525267866893ad8e30d7dfe542912a0584b8f27c9c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d62g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d62g0v0Filler.json
new file mode 100644
index 000000000..dc405b4db
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d62g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d62g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x603e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x461f94fb3cd53911d8397e4ee904fd53e3a2d0b70a23a39b7db3763d49c245f4",
+                        "s" : "0x0fb293c521307743018cc0f3bcfb2b0f30cee1ce154336dc687c95aa64e489bc",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d630g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d630g0v0Filler.json
new file mode 100644
index 000000000..8f9081d2e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d630g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d630g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102766064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf948eb8c5f2b580ad7e34d1d427b3e1c69dffa844aa87afef3d4b3d4fbf2f25f",
+                        "s" : "0x2c13c9bcab34f1dc5a69c3a2317f2b1aa010cba107df3e6eb35c46b856855827",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d631g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d631g0v0Filler.json
new file mode 100644
index 000000000..02bfde3bf
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d631g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d631g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102776064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0c1a5ad2b31bc79e370a832a52dff83777676e7b45f650cf470ad6fdf9bd300b",
+                        "s" : "0x0479f9545c0407ab93592828bdb5aedecc604dec3df47cc4358c9b001fea62cf",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d632g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d632g0v0Filler.json
new file mode 100644
index 000000000..e619be726
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d632g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d632g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102786064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x17b63dcfe5cbb3bb8d0e87a5ec6b293488e7c26fdb4b3a98bd29a8df89e0d968",
+                        "s" : "0x36dd387f2300481b2f1e062f720ccb7f3d055e4ecd4a0737aec11207855134d4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d633g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d633g0v0Filler.json
new file mode 100644
index 000000000..7a54b0e82
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d633g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d633g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102796064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xef5c26012080133fe4d03ffce42fd3c1c169d81ee152faa4478868bf1cfa105d",
+                        "s" : "0x10f5155359514973e8c72f1fa65120254cc818fb4d159531b902bcb7cd6cb594",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d634g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d634g0v0Filler.json
new file mode 100644
index 000000000..85f5fc873
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d634g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d634g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61027a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x76cf322c4ffda23136d3d576d711d7018ae500366c2279eec2baf2c9f3f5f5a6",
+                        "s" : "0x1e0d194ca560670a865e2a8166aaa7e53ccaebb4d2fd23d81ff55346b65ea32d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d635g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d635g0v0Filler.json
new file mode 100644
index 000000000..79ff00341
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d635g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d635g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61027b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0cfdbcd51b9b63016e38c7ca2ab1de93c088a489e3608a225aa749aab544d482",
+                        "s" : "0x51f0e192b05129a1c13d818f3c9b24e58137a7077522e93818bc2ee615fcfb7d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d636g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d636g0v0Filler.json
new file mode 100644
index 000000000..65be87640
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d636g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d636g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61027c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6e14f3f7249d505148c5ba33e261e33de5f3a64a3549563b8959c9d980b335c9",
+                        "s" : "0x5a67bd79f3edf3e39578c582e9143a93ec66afc86c6f6efd5244ecf4f0388650",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d637g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d637g0v0Filler.json
new file mode 100644
index 000000000..08d6d1fd1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d637g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d637g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61027d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9d37735884998196a5d7c62806c376c6ad0406d0d3e308a1794b21a74feefc0d",
+                        "s" : "0x3c693d6125f041038c0460c75eb71dd95af2f6fe46d0a2647ce6bbe40b3d043a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d638g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d638g0v0Filler.json
new file mode 100644
index 000000000..c9249350a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d638g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d638g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61027e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3fa7fe3a5bab69c560270aa3152c19cc1b1c0838be87e7f6a12bd5ea7d5a1a8c",
+                        "s" : "0x55700ad55e4666ec517373b3f067316067ebfa0241703086bbfd0179c806b534",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d639g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d639g0v0Filler.json
new file mode 100644
index 000000000..c472425a9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d639g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d639g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61027f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcd0f35d0fd08bbc68ec24929cb968216ba3c839ca660678a515f031abb4a90b7",
+                        "s" : "0x3f9d0396e035ec31e744401357ea61f4cc738a1f9797a2a49bae0f86672ac2e1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d63g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d63g0v0Filler.json
new file mode 100644
index 000000000..fd3774752
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d63g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d63g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x603f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa42c54623141bae8eadcf2b0361a8cd51969629a7a788cda219e4caa9cf11f28",
+                        "s" : "0x0d44b483d80b59b9403aecb308eb0d26d06ffa76710a2a14231d480c4499501a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d640g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d640g0v0Filler.json
new file mode 100644
index 000000000..4943ccb73
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d640g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d640g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102806064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x88324b3656a01a397d4c616186cc0e5f09739a0b8c623400916d94401dccaa28",
+                        "s" : "0x5a8fc2061e79557fb30e3648bae729986cdf16f1607defcbd6691806ac6ecf9a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d641g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d641g0v0Filler.json
new file mode 100644
index 000000000..ed690bf85
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d641g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d641g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102816064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6cbff077ba9165e2bd085fd68892c928e27ad8574251b5da2907e5fe5ade3549",
+                        "s" : "0x5d5f080ab8a350890d00775fc3e706441b88016ed38d41b62648ba00d7a6e37c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d642g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d642g0v0Filler.json
new file mode 100644
index 000000000..e9c5543f8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d642g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d642g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102826064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x49024b7ababf075fa5669320f351521207cbd45352a3af1ec2bfaa452bc19124",
+                        "s" : "0x6248b0692d81c566866a43deab759469ee5b6ba2165a09e6d36db59c55ca953c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d643g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d643g0v0Filler.json
new file mode 100644
index 000000000..1208803f8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d643g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d643g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102836064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x25135e6b2576d5343602c77f8565728d138c6c2709b225799b8af657820b98a7",
+                        "s" : "0x3c4aa4ef9b076fb7f0d927ad26f292cc17b220a6f849c5f8f0bac343e28764a3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d644g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d644g0v0Filler.json
new file mode 100644
index 000000000..02bf4f344
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d644g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d644g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102846064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xddef5e948e1f11e8e5b3a1d97953b8d78ca43aaa1e889795af5d225a4d21caa9",
+                        "s" : "0x1d5d9c4643793b1d59c4301088f0e2df94d04f7bac9f3fe635753cfc8b0e90fc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d645g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d645g0v0Filler.json
new file mode 100644
index 000000000..166dbf7ec
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d645g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d645g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102856064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6f25eff298bb0d55a331b41eeb0c35edeb64ed7b60e2eae32fa49ca498602467",
+                        "s" : "0x0faf0285f503bd63baaac0cd958a90d2390ca49fa929e3f2807185f6d9456dbc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d646g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d646g0v0Filler.json
new file mode 100644
index 000000000..5f008100b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d646g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d646g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102866064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdd2e05e2a0b3fd063b734454a35a47faf3e54551b630ecfb5275041226ce7ab1",
+                        "s" : "0x18cf4963e936629d4795dfa5423919f6c601f6963275efb4a70d21bd92559f99",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d647g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d647g0v0Filler.json
new file mode 100644
index 000000000..cd4bc78f6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d647g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d647g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102876064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6322125f309c3d96182c2564940eb100a7332e0d7db0e85336be1981aa6ec482",
+                        "s" : "0x5f1c5bf6bc13a72188a4777689c1c11b61c31ee0df4102c4ec03729ef87f6424",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d648g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d648g0v0Filler.json
new file mode 100644
index 000000000..9e39a84d4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d648g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d648g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102886064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x36bb6cc1506df44c5f4f4f645a35b54811b72b6c9534ba29338069817d3b63e9",
+                        "s" : "0x290a1880a1724f86f1fb19e1ced245a7a1b4f4a0279eb891cd0a6ff2f9e8d245",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d649g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d649g0v0Filler.json
new file mode 100644
index 000000000..d783b78d8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d649g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d649g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102896064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x58125a9e0adb78d4c8623b04bd7b338e3648ab1da77d70561b78eba0d8c9af9f",
+                        "s" : "0x140d5dbf5b8a3080b7a983a215bdd4cb1b4de868952e5f347104dfce9eed89fe",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d64g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d64g0v0Filler.json
new file mode 100644
index 000000000..b43a981d9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d64g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d64g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60406064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x55db7ce890bc5c742e0970f1f1e2a44c2188cb0d2e2373aefb1ed69fcd05fc9b",
+                        "s" : "0x43404c9a2c5607ec221277ad3d41a344199f6ab941b42b30625975d1db843bb6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d650g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d650g0v0Filler.json
new file mode 100644
index 000000000..b540f5bae
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d650g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d650g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61028a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe188ee224c0a6128cc66ad0fffe790221b10595c2405f541ac374c457cf614a8",
+                        "s" : "0x773dcb8ecfe0a5d8fa65abfe4ba906a3bb6793155ef7f1d6350d06760add0dc5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d651g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d651g0v0Filler.json
new file mode 100644
index 000000000..84c03f19f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d651g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d651g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61028b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7f0ad9534e5991e90755dce1dcaaac5e41c3cec44c5aaf9b990447dbedf5579c",
+                        "s" : "0x1198c4ba4f1e9f52a4751ea5944e329f390b3d27caf8822be2d2c36dcced9c64",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d652g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d652g0v0Filler.json
new file mode 100644
index 000000000..956dcada7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d652g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d652g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61028c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa8bc29d1545c06a28f07fc73fd3104cce1e360ea0cc82ff835b64520a2a5956b",
+                        "s" : "0x2f2d1a945f33b624ed6a3cafade7886a8aaad8e0fa3b233d5e9d37d23933295e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d653g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d653g0v0Filler.json
new file mode 100644
index 000000000..a50f8aa03
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d653g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d653g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61028d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x25762b9559fe86d9c577576bf531cc3448a0da5fe94d3645e63fd57b0ae2b14c",
+                        "s" : "0x06ce7a61b0eccadb4531cbebda1260a6b6932ef93908882e9474ed824609bc7c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d654g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d654g0v0Filler.json
new file mode 100644
index 000000000..f965a947c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d654g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d654g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61028e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xea403273ab1f7b52318f549dd831b1ada3460d6f6b730083cae25331d9056e01",
+                        "s" : "0x03e84d35a29353b426d914004dbdab137ead9047130ea89418af2b83b296c76b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d655g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d655g0v0Filler.json
new file mode 100644
index 000000000..411fd4fed
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d655g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d655g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61028f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x921f53daf8662998eed29ce42a8b177ea29e1d3203d1f21f398fca1cca69a2c0",
+                        "s" : "0x5f12870736d19c8961bafe3fe51847fe49c7a98472ce225049de4b607b13c352",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d656g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d656g0v0Filler.json
new file mode 100644
index 000000000..cd0b77418
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d656g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d656g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102906064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb65514a4bc2192d414d8f1925139fd2343ef948137b77ffffed61b63836557aa",
+                        "s" : "0x20be3b14bbf030fbd9260e0a32083460b456717878e49bf2fd07c0b7a3694b48",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d657g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d657g0v0Filler.json
new file mode 100644
index 000000000..e078ddce9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d657g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d657g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102916064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb0768bc85c905807e20529375b1a3b7e6b495c384654dfe4d1e7a4e90b3c2bdc",
+                        "s" : "0x15fb5b4a307bea6a5996c4092d08e05188dedcfd8232e81f18299b2c0edc4823",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d658g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d658g0v0Filler.json
new file mode 100644
index 000000000..c32b6226b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d658g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d658g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102926064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x244b3c474fc5a8551b482f375c6e3f5fd0901a02ace97518e18e082775fe3f68",
+                        "s" : "0x600a11df31d8b93082bee0794dd3c412c95b07db4537a681ff049b4f40886831",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d659g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d659g0v0Filler.json
new file mode 100644
index 000000000..97262f46e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d659g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d659g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102936064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc17a2dac1c9bfa37f4e9b650fa4910ff0f3ee572fcf541360da1391cfd259fc",
+                        "s" : "0x337ac8146acec5682494ce9af905bc988344b024cbd1c32e0a495938d6f667be",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d65g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d65g0v0Filler.json
new file mode 100644
index 000000000..3b3b825f8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d65g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d65g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60416064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8dc773379add646bd478a87712b2afbe39b92fbf8b349a8358e79ec68474dd29",
+                        "s" : "0x701b8b28702bd94b829293d733b11b3c84a3df0fd85e77f67902d51ce5761166",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d660g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d660g0v0Filler.json
new file mode 100644
index 000000000..57144dc46
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d660g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d660g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102946064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x58326d949250b347c08687d155d05272b76989816fcde63f9f919dd4a19960a2",
+                        "s" : "0x1e398c66dbe1b2efc390bb39abdee4d23ae80bd2107f7c82678ac415f464915e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d661g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d661g0v0Filler.json
new file mode 100644
index 000000000..3e081705a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d661g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d661g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102956064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdc9ad7b316b97c75fcaca6394143bd553cf92c8f03971238b7cc23a94489df45",
+                        "s" : "0x1b25d814561bfd7b6bf156f98b1f42da37c62acb9ac5a6fada4b53390c46cefb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d662g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d662g0v0Filler.json
new file mode 100644
index 000000000..f1a5f967e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d662g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d662g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102966064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x49d411429f7e0f9c20148f4aa186f88fe393d088fa030658a6af7a78d745adcb",
+                        "s" : "0x11360bd773be8e26eac717ac9a2b00dc9a8731bcc2dd9a72cf120095446171a6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d663g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d663g0v0Filler.json
new file mode 100644
index 000000000..bcaaea938
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d663g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d663g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102976064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7f9ebff7a6a43444ff1d45b85c30777a8471ee99b92413e299a6555e8696fdb6",
+                        "s" : "0x545159e9042d6b07c9bf6b35d876fd7edd10588da465e006b15acd3418158b9b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d664g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d664g0v0Filler.json
new file mode 100644
index 000000000..be2c1e93c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d664g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d664g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102986064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x926d68218e44456aa681988995464024eb1e53aa7363bb1ae406d2eea5682f20",
+                        "s" : "0x1501890391e6ad431d462580cb814b15d29b7a5368894a1e2f89ca137eae21de",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d665g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d665g0v0Filler.json
new file mode 100644
index 000000000..3e871094f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d665g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d665g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102996064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x41f160ffff82681ee1a87e35ac16c8110a2f99efbb8a17ca8889cb90b456d31f",
+                        "s" : "0x4f7d0dbf24f1b9e4fe32363fea92f86083ae556f139a600d12cf91fa875025a2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d666g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d666g0v0Filler.json
new file mode 100644
index 000000000..f77c7677c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d666g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d666g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61029a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2a0f393d796718ff1f3383588b7a8f28987b878f1eaa8dcf9d0234ee6a4411db",
+                        "s" : "0x40733534b3606f88848497de670e7e68948fa1b8128745e015c18120a0427cfd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d667g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d667g0v0Filler.json
new file mode 100644
index 000000000..949fc8094
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d667g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d667g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61029b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x25aec8c6fb73b080795997bbd13948d19369f9effb2f358281f79fb65d521e6e",
+                        "s" : "0x5f21f22ebe405ad8d8c97d828453af44895aab43da8c29a62ca6d4411bb2f67f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d668g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d668g0v0Filler.json
new file mode 100644
index 000000000..56d2cc416
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d668g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d668g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61029c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb77ffe07997e6af860638aecc18d4c49d2a4f0e39f0b5a15a52df0cc93716427",
+                        "s" : "0x488b89a8b572c2ff2c8e69bd7e5e5dd41ef28f72e5fbbd108d51264a7e12fc73",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d669g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d669g0v0Filler.json
new file mode 100644
index 000000000..a2a232aec
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d669g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d669g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61029d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x08b8209d7a06a87066eae4e2eae3c236d710702c0e260fcd3f95c43f970d5a20",
+                        "s" : "0x56a47ef44334dcf260977a122520e4f0cc4c8d6ba742c73967bd1339c4fc81dc",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d66g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d66g0v0Filler.json
new file mode 100644
index 000000000..2fcee29f9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d66g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d66g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60426064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8f881dfa464bda7837cf6ab94edd0fc049de77fd0fb9d80195776f83f956da7b",
+                        "s" : "0x2857848a61e72a74baa5815eafdb27c596e6ca5c5ed22435e46e3baa900bc88d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d670g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d670g0v0Filler.json
new file mode 100644
index 000000000..9989a7d10
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d670g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d670g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61029e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x250ddf2c41dd0ad95144f9a4edf68f1b93e0edd5cc46f6ed8f6144bd6f30cbb2",
+                        "s" : "0x536fb2237363db2e273f1a392c666aa9e2608498a97731607bda7f966e2bdfec",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d671g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d671g0v0Filler.json
new file mode 100644
index 000000000..8b1f8414e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d671g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d671g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61029f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x89c527dbfda85c3bb462ab55b6920215fb483352ce8f6096d2ce0453ba7c09bc",
+                        "s" : "0x7e6372f2e34259a1f657388c8938ce3c58cf66d821484ba1167e9c4b30984c44",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d672g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d672g0v0Filler.json
new file mode 100644
index 000000000..5256ab4f5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d672g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d672g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102a06064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdd32d40dc150c94d204504628d254d1b3ff962826161a5179798aa71d2d429f2",
+                        "s" : "0x181f7615e679ee48ebf2cf7bb7666a1e3b35071082c296d7e00e845b2a3aba76",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d673g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d673g0v0Filler.json
new file mode 100644
index 000000000..2c7659625
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d673g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d673g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102a16064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0ca28cac7720a51d0cdd76482548e8ef55d834e297dea6a3d9ce77876c234dab",
+                        "s" : "0x3c80b59a795ba135309156e974ede932bdcf43c167b7f089ce5bd66db5f1afc5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d674g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d674g0v0Filler.json
new file mode 100644
index 000000000..5a7567be0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d674g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d674g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102a26064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x20549c51ee716e321c2ef221b158cbdd06cb98c189dc760d7504024098d13e6a",
+                        "s" : "0x1a154a63979dc90b36140a0129e018d780b5a42bc7aa0dcbcb1a9c43086949a6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d675g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d675g0v0Filler.json
new file mode 100644
index 000000000..417037259
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d675g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d675g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102a36064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7919cf5bac54fc481d93b33116137dc2f7c104a179248cf7eb1355e8079b18e4",
+                        "s" : "0x380848ae2b0b5f6731879f663a11aef0be6cbbba7582c9becde0831b17f675f7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d676g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d676g0v0Filler.json
new file mode 100644
index 000000000..d5edf9788
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d676g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d676g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102a46064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x75823ecdad1a52a927626de7be1e2807e6fc91dfe044e0d8c3f51e2d56ef31ce",
+                        "s" : "0x3f41e611b5b73d98584f7b3d027a74dfb789df265f1217066777499083435b96",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d677g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d677g0v0Filler.json
new file mode 100644
index 000000000..fd6c13185
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d677g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d677g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102a56064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb6c4ba083f7b81d413c8d0b8d9328c4ac18dfdd9ad7aebae7945f100a3bfb56d",
+                        "s" : "0x314d6eb1a7a49d925083232d0a93a5e3f20340b222b6034d9fb710ed9f8da669",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d678g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d678g0v0Filler.json
new file mode 100644
index 000000000..ad80ecefd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d678g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d678g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102a66064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x17a98233580a63587192555733fc86d6fd437a9b8fb88d519eb2949e0f286db6",
+                        "s" : "0x04bda2392f83c268ba23b02cef261f9c3acdf21f6dce98562c1380b354140fd5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d679g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d679g0v0Filler.json
new file mode 100644
index 000000000..bff8bb4b0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d679g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d679g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102a76064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcb2129937ef777d129be24b42855fc963eb49719e22b55faca143b3d8d365c45",
+                        "s" : "0x37ad2c3062bd3d4713d7c5783281be73969ce3284d0fd3ddbb33ce502ffe20c6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d67g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d67g0v0Filler.json
new file mode 100644
index 000000000..10bc3f219
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d67g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d67g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60436064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0e6cb0f715ba42700613fd268d81e001c32a0f370dc67175c4d75552415cdedd",
+                        "s" : "0x44c0a4ef9114fd61ec36daf361328f884eb63dd665facd6fb8786b1b0b583e1d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d680g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d680g0v0Filler.json
new file mode 100644
index 000000000..e1d24794f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d680g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d680g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102a86064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5dbc805fcc66bf6f744284876943f17c8f871c264698067e095ef02c5665a0fe",
+                        "s" : "0x4782a7cab56951d2586be72278629bd548a2dde385df01737fb45d9092db765f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d681g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d681g0v0Filler.json
new file mode 100644
index 000000000..8bb4c7018
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d681g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d681g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102a96064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb196b04a2691e570ab14c60a65b0aef28e40b31cbf6785a6e7967148971e6262",
+                        "s" : "0x69fdaca90ad5b9568f48a61df4cee556cdfcdf21a5971189c993c481852e6ba6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d682g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d682g0v0Filler.json
new file mode 100644
index 000000000..edcc11c81
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d682g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d682g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102aa6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2f1a2b3aecfc217b6d69370541b3bb971b7b3fa9fac7fbb1108976195122e546",
+                        "s" : "0x14d4a8ea8c0e02d30093898e031179342a755b05d4fda9838398e4755d4f8572",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d683g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d683g0v0Filler.json
new file mode 100644
index 000000000..bb3160da5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d683g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d683g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ab6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xae1278d3d7f4a2c9c0a56e8c8e902ec93bf2369a13b109ebb9d734ebcc63ed7c",
+                        "s" : "0x46bce88f78a1f34593b0d1b27389069a1326d102ff4ea2880975a5a7c63d8a85",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d684g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d684g0v0Filler.json
new file mode 100644
index 000000000..7554db029
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d684g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d684g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ac6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x533cbe152cdf6ba78857e066b8b42c6976be145a80b6746724cc593ae82b3618",
+                        "s" : "0x539575fa270db8000855ebf3df3f18149f2a521458b2f5209fb01581bd558fd0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d685g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d685g0v0Filler.json
new file mode 100644
index 000000000..875feb824
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d685g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d685g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ad6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa98807ec2fd5ebe899471ba50ded82b940e893895e714071580a43b8e2b0976c",
+                        "s" : "0x513521c75e167110eb024bb156995a7602235c0576bfd030221be36b899feaa7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d686g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d686g0v0Filler.json
new file mode 100644
index 000000000..039567b51
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d686g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d686g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ae6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5ddeb94b8733a006edd8462ccf2d1f2ad8fc8da89b8962f0c9a6c43d9fb621a9",
+                        "s" : "0x5c5dceb92680adb135571fc41f36ffef0ec1c4598f05476d16413f501810c6f1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d687g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d687g0v0Filler.json
new file mode 100644
index 000000000..ac61135dd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d687g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d687g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102af6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xab1ebbc1a4836a405f7620c66e3d7fdf404e94b8e1a699418207ab857ec5a669",
+                        "s" : "0x3093e56563ce94c082bcc0f50102e9c4d9786deec041ca9e6b79b19a69ae84ec",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d688g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d688g0v0Filler.json
new file mode 100644
index 000000000..c396430d9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d688g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d688g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102b06064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x33c8ac8006e83b62c5fa367c0e22c3c8391d9ed20d70438e1dc6f61388fa440b",
+                        "s" : "0x6f4d94b473a6e7b9c999a70fe97224084f5250fc771c2a082b89b4ffbdec4712",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d689g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d689g0v0Filler.json
new file mode 100644
index 000000000..5c976e929
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d689g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d689g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102b16064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x15e099a0686891f7c84c7693df222402be2d5c8d32d3d781bbedef7233413ea2",
+                        "s" : "0x5437a83311d52bab54544c1779da8d47d7196e41d50fc00996c9487956e33bce",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d68g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d68g0v0Filler.json
new file mode 100644
index 000000000..663708e1e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d68g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d68g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60446064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1887e27abf38fca1c437e3b9b255d2a84e69a753941090ae3fff81729228d3cc",
+                        "s" : "0x102129004298fed81c7be5617599ef53b6c6e4de1828b1ca15029fe8d13823b7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d690g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d690g0v0Filler.json
new file mode 100644
index 000000000..9e549bb55
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d690g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d690g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102b26064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x72263952da8247639683ec74d71d5c8be4eb751541352b83e5f592b23c2da5c0",
+                        "s" : "0x4e0a990b0cc93c57c950aab47899285c7bfe0702f68cf7aa1e2bb690ad8de02a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d691g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d691g0v0Filler.json
new file mode 100644
index 000000000..36abd53c0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d691g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d691g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102b36064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa99fc26a24636c20ba08ddb55657fc38f34a19924059971c9415ec9bbc653f76",
+                        "s" : "0x3d233a70f88578abf3bbef8843b803db4075d5f4ce8672e876b8c942df803b31",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d692g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d692g0v0Filler.json
new file mode 100644
index 000000000..06bd3d133
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d692g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d692g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102b46064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4e9f6a0d12664227cf3b3b0f7653b86ee44fa8207a8ec120eab06f4854696875",
+                        "s" : "0x230d3592284b246fa9a7e150219e5c33ef04f5fcf9cc4d4fd7bf39b8c438f77b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d693g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d693g0v0Filler.json
new file mode 100644
index 000000000..769a56035
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d693g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d693g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102b56064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x07a2db3dfaa2290fcd1573cb88352b40fdc053a0683761aa6e763f4d4d99f2bf",
+                        "s" : "0x15fadb065d46c6c9ca2ba200488c2b47122a08265a0a3b277ffa860b6799a3ef",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d694g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d694g0v0Filler.json
new file mode 100644
index 000000000..a2901a2d3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d694g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d694g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102b66064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2e7dc7b8b034d27688836639caa8e4625502d2438b7f2bc9e13ee6af342164fe",
+                        "s" : "0x08982faba486a7646f72f796836a16c510a6540fb9103b0869facd90455f7b61",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d695g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d695g0v0Filler.json
new file mode 100644
index 000000000..8f1b0dd34
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d695g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d695g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102b76064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdda6a48900ae77f06596995ac97990785248ac76b6ef2daefb6e7fd1840bd5f6",
+                        "s" : "0x445a124bf29d9f943e8095c533b0dbe758f34eb2fe85bf8e2035d0025bcd75dd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d696g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d696g0v0Filler.json
new file mode 100644
index 000000000..60ed0c2e6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d696g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d696g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102b86064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xab58d491e679ca31c8ea92033b0a70956f466d2b2de2c4021f28a8bf162ead44",
+                        "s" : "0x464061186cd4cf17ace7b2ddbc36c293edcfd003acf11149038190eca4b22ab1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d697g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d697g0v0Filler.json
new file mode 100644
index 000000000..bc36877f4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d697g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d697g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102b96064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3dfbffba159c24166811a47c4eff2cad63d7d4e145f631f163a69b48d096ec4a",
+                        "s" : "0x122d6a3cfe48996291c822475783962b62138dfead20ae0bb5bcdda0faf05c02",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d698g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d698g0v0Filler.json
new file mode 100644
index 000000000..a2e8702af
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d698g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d698g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ba6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x44083475924629a69b9fa0c1bc5f35c8a8ad26f8de787d9f2c1d209bd327ad23",
+                        "s" : "0x1445283cf6c7ee7bfc6021427c8a87dff404cfd833fdf38b24f3678586a02ab1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d699g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d699g0v0Filler.json
new file mode 100644
index 000000000..45210ce36
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d699g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d699g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102bb6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf4089c5e1b2cac86687aa330daab28299ae9e95613486cca1cc668c2188aa9f5",
+                        "s" : "0x3f852a2fcf2de94c386904684619837ad7ab29a62c2ef36fac7307c3c31b9046",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d69g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d69g0v0Filler.json
new file mode 100644
index 000000000..dde992850
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d69g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d69g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60456064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x396f08071a85f9bb281b973963f2ef5c7d42918c9ed8af723d9d6a75c38e279e",
+                        "s" : "0x01301b9b6b63d9fae0e69e85071a0010b24fa5e923e08908373cf57f3cbd8580",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d6g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d6g0v0Filler.json
new file mode 100644
index 000000000..33a552acd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d6g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d6g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60066064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9d6b0a53a92a8d2082c42bdcb7df8abcaa7fa09c4f358a083a25b91992df3241",
+                        "s" : "0x2b47256c63209d141706d89b1094a0e85771c7e1102a230240a58ea45b7b74f4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d700g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d700g0v0Filler.json
new file mode 100644
index 000000000..46a99a9f5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d700g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d700g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102bc6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8962fd10435d13a75d0360831394e939f0d7d2130dd2cab9c52f96d97a066d66",
+                        "s" : "0x49a3eb7163d2b79271c134add193e1fd89a0000aa7840a0c625e587a6e519c46",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d701g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d701g0v0Filler.json
new file mode 100644
index 000000000..670cd7242
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d701g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d701g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102bd6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7b5045b4ba0f6f8c49b400365e7996d37b226f18422d5ae3cdb52eb311327683",
+                        "s" : "0x4f51a9d607de5a514db2c2cbac949343716bacbd338f5bf6fed88802d99ab26c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d702g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d702g0v0Filler.json
new file mode 100644
index 000000000..0ca012d22
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d702g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d702g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102be6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1f2411338a1012000504517ff29ae8df305043cf24bad3b49839ca9df74911d2",
+                        "s" : "0x29b2f57d4a44402d066ce1eeb9244a0f5d1f250be88389fb2aa49bf6df38b8c2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d703g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d703g0v0Filler.json
new file mode 100644
index 000000000..32898dbfe
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d703g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d703g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102bf6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4b0fe68aee330d448c9d4644179fd359ec9151ca76398a31bad00bb32e0ccf4b",
+                        "s" : "0x3dcfc2882d0fa7bfb96c96036448324616906ae94dc4d4bcecb4c2c9e82f96d8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d704g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d704g0v0Filler.json
new file mode 100644
index 000000000..6206d5f9d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d704g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d704g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102c06064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaab502683aef740b10b5d6980b1260291fdd38db7a4a5d936adafbedc3d5502e",
+                        "s" : "0x63d895cc39c586c13b0d07b4384b8b8ed0973064d2525748759723efe45c13ec",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d705g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d705g0v0Filler.json
new file mode 100644
index 000000000..63c1e778f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d705g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d705g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102c16064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x437d195341f92709083039d0b16294a45b2b8a7f3075cf46371dec6a6a831489",
+                        "s" : "0x33a5b2050ba19005686f2baaacdbe48d55effa71f69b47c69237710ab6056941",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d706g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d706g0v0Filler.json
new file mode 100644
index 000000000..6abef1c6b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d706g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d706g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102c26064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5abfc387a4c9a4cbab45d5ee48b9b0d19bda0843fbbb64e9f1ea52d893a2193d",
+                        "s" : "0x7aef561932687bea07cf26378615b94137ed3559c8b9d0396f37fb6704db74b0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d707g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d707g0v0Filler.json
new file mode 100644
index 000000000..dacce12b7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d707g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d707g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102c36064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9f008f9ca153e46d36219367a41ec7e3a3a55513188eaf209064165cded7fc0c",
+                        "s" : "0x3b27563f65dd20a0665d20cc11723fca426705a898a69188da0b3976410b7bcc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d708g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d708g0v0Filler.json
new file mode 100644
index 000000000..58ad2d9da
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d708g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d708g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102c46064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb041f1df1ea691b91b0bb46533459c0d26c9049b5bc018958555951246b8b307",
+                        "s" : "0x2213717e10e63184fb6a374f8e1470a5b768258e76971f0e00a0ea3fe03a5192",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d709g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d709g0v0Filler.json
new file mode 100644
index 000000000..833a274e2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d709g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d709g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102c56064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x63a73f992ba84af60f87092d5ed15f98b0d1d0ad45c4c1078c11bc9898509b73",
+                        "s" : "0x65ef976a47c0b0cb1d4079cc6f6ca3d0b4c45f724e5593857401ca975574b558",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d70g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d70g0v0Filler.json
new file mode 100644
index 000000000..14ae2feb2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d70g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d70g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60466064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9d6f3bd82daef17e9129c2896c4f4c112e638916d06f88e4cbe02792465dcff9",
+                        "s" : "0x37d8e0ce62104e9d4a87cbc98cb381b632c5ded68db73dbb2b47147a6b8ba9cb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d710g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d710g0v0Filler.json
new file mode 100644
index 000000000..64ce01faf
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d710g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d710g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102c66064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x212c2c3cf8685c1f5d4805042450c2d6de08d2931a882b31fa8ba588189ec579",
+                        "s" : "0x49d58d593b97ef19fafe6511970ab03298f83bc1df74355779c3e4218dceccc4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d711g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d711g0v0Filler.json
new file mode 100644
index 000000000..43cc7658c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d711g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d711g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102c76064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd22c9fd0ef9e6c73ad181fcd4470d4bcf58141fbc7dc691813581048f9c6defc",
+                        "s" : "0x1d17adb7861eb1b17dea473ef88c7dbc073e1ab8a77f556a151aab39b101c8e1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d712g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d712g0v0Filler.json
new file mode 100644
index 000000000..864e8c9c1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d712g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d712g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102c86064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf383c84d5b76dff3f09493ff7e4ceb275090092ded842b2c8e7beb8554302e7f",
+                        "s" : "0x79170d576c1b5fe11e42cda42de6e15c241e3650ed5303545bb3869c6c7908df",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d713g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d713g0v0Filler.json
new file mode 100644
index 000000000..6e657adcb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d713g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d713g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102c96064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xff84897dfc346e61dee1bc1ecc04fe3ec95fd1227b113c37576f47231d1ae1ac",
+                        "s" : "0x67b98f4340c2e83e672a1ffa701b54143f19f35e86e7f87372c4797d9f6d172f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d714g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d714g0v0Filler.json
new file mode 100644
index 000000000..9dea54994
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d714g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d714g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ca6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaf55621613244acb5075f7774aacc9bc3ce151af47d5b3659614389200a8e377",
+                        "s" : "0x565c02268507db18c26e8073553b1a70258953d9ecba1ac22b18c4a203aa6cea",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d715g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d715g0v0Filler.json
new file mode 100644
index 000000000..4b21a58ed
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d715g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d715g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102cb6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0127b94a702054d586f95f2334d7dda03426e6406e84547035e333d06020e1d8",
+                        "s" : "0x7655ae5be3f7e49e72d7f33edac3e92354f9be1f87a47c87c1ead1483449c490",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d716g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d716g0v0Filler.json
new file mode 100644
index 000000000..2120ded13
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d716g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d716g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102cc6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4c085db1eea4419955e8d3631d4bda9be5b87bce18b774929c873803e1eddd44",
+                        "s" : "0x468a6e9a28120eeef6415323526b356807444c12d9245fd409f5d834a92b85da",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d717g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d717g0v0Filler.json
new file mode 100644
index 000000000..b11649327
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d717g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d717g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102cd6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7b775ea94baee2d490e3e3a99d0512c6f65518a0ae1ab772beb2574df0577ddf",
+                        "s" : "0x1836e6a4361c66fd84d607c0dbbe7804a0f1d565e01e36d0a0f2e76f3c470786",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d718g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d718g0v0Filler.json
new file mode 100644
index 000000000..d590df4a0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d718g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d718g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ce6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd3486364d17cda0bc407a6710b7fa85642688717cdebc7195f501e08f8a8b677",
+                        "s" : "0x36998288017c6db8659de9645c8346a75b2e7207e353f8c224dd2d86ade38bd3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d719g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d719g0v0Filler.json
new file mode 100644
index 000000000..43b15a175
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d719g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d719g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102cf6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x40e273b73b3a56287cfd689db81dba3f236294698d370e2bbeb29ac64384a9ed",
+                        "s" : "0x0865cc47bd6c811541fd3f999a3e48b05141a6eb037701efea6de53fecc0cc0a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d71g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d71g0v0Filler.json
new file mode 100644
index 000000000..ead3b85a5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d71g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d71g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60476064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6c0e0bd9508fb404c1de39423f1e8747471c727a1241da301ec3665d6b09549d",
+                        "s" : "0x6375bba8be2e971bcc88c6d1b171f5d2a0e5ddb6bf32f082438fd5bac22fef64",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d720g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d720g0v0Filler.json
new file mode 100644
index 000000000..2f2eff340
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d720g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d720g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102d06064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xccfc2ff0ace3d9af46af62d2a6255db9e2efec6d64278ad70279994b44522692",
+                        "s" : "0x6ede8d329b26a865f2d9c5bd4aa56da0a89a67d25d8fa4ba3f6df8400181bade",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d721g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d721g0v0Filler.json
new file mode 100644
index 000000000..5df30e08e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d721g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d721g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102d16064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5bc60e8fa6cb442b681631052cafaff08ad0ae63c1167e6dc1345221d5d9593b",
+                        "s" : "0x6d31b68a3fbb370673def045773a5caf7c4be6ea627d1c3231a0f1ea50046142",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d722g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d722g0v0Filler.json
new file mode 100644
index 000000000..7c8287817
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d722g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d722g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102d26064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe9039b44eb4b36cfabe5f334bbc06134c26708f394568856e7a27af05c62e8f9",
+                        "s" : "0x5f97019bc2a4c5b40c75db7db74692d7e5b5ff07e30af3499c6db17d599ad738",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d723g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d723g0v0Filler.json
new file mode 100644
index 000000000..cce8c2e29
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d723g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d723g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102d36064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x395469f0367a5fd175a52437da25fe943c7d8f1bdb2614311f3972430fc64dae",
+                        "s" : "0x7a5703b72fd713300bb7ef36fe269f996aa8e953eb58c02bef2f28bd5b0ee8a5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d724g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d724g0v0Filler.json
new file mode 100644
index 000000000..8e72d5633
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d724g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d724g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102d46064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcbc0c535c71cbcecd8a243272dc8b6b27aa89f87070e424a66f4045c8d00b5d6",
+                        "s" : "0x080238d738ee71d1cfc74ec109b690cc43d32c089e6e7b7bfad50d0b80a04c23",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d725g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d725g0v0Filler.json
new file mode 100644
index 000000000..aae2c5825
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d725g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d725g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102d56064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x228dbf94afd84f5a6ff502fe94de4782368e3edf11d0e13caf29fbecf7060172",
+                        "s" : "0x02e71b88a31de6c1235463d85717f57703b112aa565f50bc2efc01465886e109",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d726g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d726g0v0Filler.json
new file mode 100644
index 000000000..700c48711
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d726g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d726g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102d66064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8980fda9b12453e9de46b0361b45b7998cbb7e07a504fe836e86b6a4a20180c8",
+                        "s" : "0x3b05955f8e3eb5026812255b2b2d415e19aa0014bcfee00bd782bacdaa893bdd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d727g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d727g0v0Filler.json
new file mode 100644
index 000000000..fc336739d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d727g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d727g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102d76064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xebf1e4d85d38eb11adf1bd63a2441510313ca61c7bfebd3adf5c16ed39544a5a",
+                        "s" : "0x5c6c366f60002af2fa7905fb7802853301315d96e0c00c580ea2441f00851f7b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d728g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d728g0v0Filler.json
new file mode 100644
index 000000000..c0088d923
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d728g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d728g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102d86064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1d900aa87298f450981ddbd33c231ede4a85bf6ae953f4e7b5c5b31122748a12",
+                        "s" : "0x1d35d82bbb5b979d449b7edb7d7e63d1dded81d7dc2c011c3cf219f4d7a8c568",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d729g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d729g0v0Filler.json
new file mode 100644
index 000000000..297e939e9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d729g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d729g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102d96064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xac1587ce5a9222a2fbcc03f5fb42d171cb8e2ba0e8883722be084f553a4bb734",
+                        "s" : "0x0926802ee2e8a238a15d0d2782cb78c5820c2bfd33cb298f49d60535525011b8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d72g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d72g0v0Filler.json
new file mode 100644
index 000000000..ecb793e79
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d72g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d72g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60486064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb544278dd68314792159f8cd68b4a7f1c496940959138b4ecb36162d19e04616",
+                        "s" : "0x0505e81c95a9e3799a0945f5050050fc4df619ab1705c76d6399d81dbeab5086",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d730g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d730g0v0Filler.json
new file mode 100644
index 000000000..c2c9ea14c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d730g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d730g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102da6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7a721f8f4424cc4c0a68556833bb3700127b51f54cd086acaac4af817cf698e5",
+                        "s" : "0x2d7724b96cc43a7ed7c4f98beb379feffe1d909ae3808c76d1830102b9fc30",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d731g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d731g0v0Filler.json
new file mode 100644
index 000000000..e86782b46
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d731g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d731g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102db6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6972b6d58f931cad7bca798c8d92eeb33431c8b8da33018f82950203e382877f",
+                        "s" : "0x497a03d68a398e6c64f90fc7cc575ba960aa8de426a828f47257d127a88f44f1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d732g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d732g0v0Filler.json
new file mode 100644
index 000000000..1d1db136d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d732g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d732g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102dc6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8f495068b80ef61724b207796d160cb64c201d7b8311a37a8b19cc9af5baaabe",
+                        "s" : "0x19f6ccdd7ccef5cff4bc73e6b57482b234dbbd4373411ea4f91acbf65a046cd1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d733g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d733g0v0Filler.json
new file mode 100644
index 000000000..d360cadc7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d733g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d733g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102dd6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x60b2af443a2390343f0eed4a75e0c31b7fd6f3d135962e7fe11ce80e6e8fa36b",
+                        "s" : "0x3c06651a72a7c22637d55ba27d366260636b3f8776116d9fd67c8abee85e71ed",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d734g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d734g0v0Filler.json
new file mode 100644
index 000000000..93876d7b0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d734g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d734g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102de6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd0302ad396d7b8e09f8cc3683e1ef9bff45a62ab99528ab1fe08596a0506274f",
+                        "s" : "0x4301b0f4e2b8d73da9ce80001e3869f7d9c6649d39d1988c99aab984dfa801fd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d735g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d735g0v0Filler.json
new file mode 100644
index 000000000..7fca502ac
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d735g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d735g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102df6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x75e985909170d76411a2523e7f59247ef633460137d86149936dd184e804811e",
+                        "s" : "0x343b17c2b0044e903b0c48ce6abfcd8455b171531ea059dadd657e18bf22f8e1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d736g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d736g0v0Filler.json
new file mode 100644
index 000000000..8dc6b754d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d736g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d736g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102e06064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x88659be31e555f710b82bcc9f10b01f19ffcdfe43015e7243c45a1f55c7db8b4",
+                        "s" : "0x1550068cbdf45daf6ef57c31e65a1d0bd090cbe00fb8b74fdf8f90be7c7e702d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d737g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d737g0v0Filler.json
new file mode 100644
index 000000000..17f78acee
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d737g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d737g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102e16064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeb7fce8037d6c57b4e30340fde7ac0386c6f6c93e83f683897a12d2bb0b1a9c4",
+                        "s" : "0x4f205885159b867424fbd785072158d284a4d8a72f7af57234bac8bbaa0a6818",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d738g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d738g0v0Filler.json
new file mode 100644
index 000000000..09c491971
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d738g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d738g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102e26064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1b463e556a4efe69f67e0edbe719c637ac159ec1d2ab312bac05452ac877ed6b",
+                        "s" : "0x3836899932b002404a118e068da6cc351a29e425c5050cdc8e79af6f7ed74337",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d739g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d739g0v0Filler.json
new file mode 100644
index 000000000..13e7d4554
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d739g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d739g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102e36064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5104e8df3c4f476bd4e71140c227bc3631f2458ec1fae3172b89d09f67522582",
+                        "s" : "0x1c74262f684ff710ffbc3a4162b5325abdc00753ad3e64ba0f0844fef5f3e502",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d73g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d73g0v0Filler.json
new file mode 100644
index 000000000..f4e7409f9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d73g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d73g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60496064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x65418bcc715afe23d4e7b5564cca401cb762955fb236f451c104ee9a9ae919fd",
+                        "s" : "0x21683c4a841d485f1ed788e04b6d3bec674fd91be7aef68712b32d090b2ab008",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d740g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d740g0v0Filler.json
new file mode 100644
index 000000000..533de5e51
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d740g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d740g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102e46064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9459b3d0dc6574d656a80b405e832c0b4ad4ee722354713bad96d7f48f981fbd",
+                        "s" : "0x0f121a62321d2389e1bc550ca92fe4b893b622ff60056dd24dd1adf82d93eb73",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d741g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d741g0v0Filler.json
new file mode 100644
index 000000000..7ff3fdbb7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d741g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d741g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102e56064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xab7663a24b3c813b243435aadd28cc73e835c0b939116180381b69fcf8488103",
+                        "s" : "0x23665b4706be4ba40e0cd7f2a270104bbc47f49fc8079a3d05e1603575dbcb1f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d742g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d742g0v0Filler.json
new file mode 100644
index 000000000..832424f0e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d742g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d742g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102e66064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa7de0f55fb5765223a5e334219669ecc0db1d481bba97e6263b0840b2946fc1f",
+                        "s" : "0x085ca5605ea4e78d58e6b12b46d91e7c841db7ed279b5acb2d483f6ee2b1d644",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d743g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d743g0v0Filler.json
new file mode 100644
index 000000000..ecd36a8b7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d743g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d743g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102e76064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x765e5885b58760c5bab0a8e3700e0dc599206701f37f6f3a5661c360cb28769e",
+                        "s" : "0x24516a822aef974c170ad672b7653777555cec877305198010e521f1913a2464",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d744g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d744g0v0Filler.json
new file mode 100644
index 000000000..abdec40ee
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d744g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d744g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102e86064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1d3a4ddf11ce45add82ef3fba51fb53e3dc4b95d05a88a8035a137ca8f7b3aee",
+                        "s" : "0x24f41663ffefe581bbf18a055332bb02b718c465a66437945634f5301f7e0977",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d745g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d745g0v0Filler.json
new file mode 100644
index 000000000..9303c1930
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d745g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d745g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102e96064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x85d7b3faf51596a0671b6452e18e8b9d9edf7c49bb9d7607c9a16cfa946cd21b",
+                        "s" : "0x1ba2886615236c86ddaae135540143d443f7efe5ba7cd2ff7ea40a8f3a340d72",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d746g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d746g0v0Filler.json
new file mode 100644
index 000000000..fee1bb3fb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d746g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d746g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ea6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x79403acf0c13b0b2744accbefd721187cb910e7a06ef1a0ff971bc84587e3b81",
+                        "s" : "0x12bdf552c5cad04186badebea3b5c81c8ead628b42679e525af650bbc115fe91",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d747g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d747g0v0Filler.json
new file mode 100644
index 000000000..428f564e0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d747g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d747g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102eb6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfd3504b58c1fd353c200026081f583fe07b59fa88f834c9b2fa3c0648b08cf7f",
+                        "s" : "0x12b2a4ee3a75dc34d0956503182b11d3cc2c000ceb66332e5d409c098aa826de",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d748g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d748g0v0Filler.json
new file mode 100644
index 000000000..ed2bc33ac
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d748g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d748g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ec6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd42951d3f18c922e8f1c92fbfdbbe12c0a592b5dfcc69d6324374e9869ec42ac",
+                        "s" : "0x5475a9a1b974e874e2a1b5e8bc040a82056b97bdaae2a2ecc3fc7871fe56fe42",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d749g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d749g0v0Filler.json
new file mode 100644
index 000000000..515508662
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d749g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d749g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ed6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x48e5f5ea513b3a2d035ef6558a0389e7727a8ce23c1ef35d756a76fe1af4a094",
+                        "s" : "0x1e51cdace46211c88a0c4e388af3588032c2a48f643caeff35f5ecda6c3634b4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d74g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d74g0v0Filler.json
new file mode 100644
index 000000000..19b1907b5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d74g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d74g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x604a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9e5ddedd6e7b2a06fba8daa9b31a5afbc0096e97a986c20c8be22fa7a0bf4ce8",
+                        "s" : "0x27f1897571577750819755eed75bf10f2bc5bbb24f0922e2ff324edd84080a3e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d750g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d750g0v0Filler.json
new file mode 100644
index 000000000..d6325e60e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d750g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d750g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ee6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa55ea86ca899712dde55d67e520d5ba5eabac220f544cf70f4b089c2da78d576",
+                        "s" : "0x1dc03223946ae97510beaeda75e3bec733070a280bed396b03e56a12c24e7d81",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d751g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d751g0v0Filler.json
new file mode 100644
index 000000000..fac3e5763
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d751g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d751g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ef6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x500edc0ef2b27e6565068a73f04e8b1a0c8298781301df2a2237690a50770380",
+                        "s" : "0x1213ca18f68c2b2982681fb06ba3cbf2053223080537d9d3dc8e4ea3d4e5073a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d752g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d752g0v0Filler.json
new file mode 100644
index 000000000..75d68c205
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d752g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d752g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102f06064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb7d2e0f65c8230d534bd97578835d27c074565f27d4399c4301271271a9fc2a4",
+                        "s" : "0x4c8436d94299a6c5ade275005a1518edeface6223389c8fc54882d2649fb6d73",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d753g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d753g0v0Filler.json
new file mode 100644
index 000000000..38b5384d2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d753g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d753g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102f16064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x677d80f4c6ce9fea81c22a10cdce8f7c58b7704f24473bbf577050a9649cc9e0",
+                        "s" : "0x47ce00a5dd736e868bde82e3a3ffd171b75e373179fed3c2cef121768e4465aa",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d754g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d754g0v0Filler.json
new file mode 100644
index 000000000..90ff62c0d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d754g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d754g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102f26064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4243aaf14232ec4caa285d92143a5231d562f773686f0c17fcdfdd7eb29b6a4f",
+                        "s" : "0x6a60bd4b9e8a967b701dcc80f9b741be479eb436d96b472542aab5c06fd87f66",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d755g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d755g0v0Filler.json
new file mode 100644
index 000000000..cd8b7d850
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d755g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d755g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102f36064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x15d3c18176a68ea461f22900c0318c3602be81eb37b4e93af4c0085b1e594e28",
+                        "s" : "0x78ba82f782c947a30a362074aa70f0c2049f4ae1704ad41c0a1a1aa1467bedba",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d756g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d756g0v0Filler.json
new file mode 100644
index 000000000..814079878
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d756g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d756g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102f46064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xece60489b5c2caae0a457ee19ff949e0fbceb5e782e23e4c9a0cd4cdb92b9b21",
+                        "s" : "0x5132a6d251cb08fab6057faf38f906dc3392c37a46f7c5a4e8128f521982ac53",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d757g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d757g0v0Filler.json
new file mode 100644
index 000000000..e58f94ec7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d757g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d757g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102f56064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6e0c610f7df3c470ffc5e15587027a283cbc19b6922a356bcdde61ca2ef9d0d8",
+                        "s" : "0x7e135078e6c81ff0aee0265f60517ce99b605c477440d12e1b38b840abfea44b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d758g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d758g0v0Filler.json
new file mode 100644
index 000000000..fac4eb05c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d758g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d758g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102f66064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xddc580308f0a2ce4b3419c886e0b17cd72251ea7effa3cd40581bba645555375",
+                        "s" : "0x30419dac3be370a30b5ded825e2a85c35cf01f0fe621ca263993f85e05dabdd8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d759g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d759g0v0Filler.json
new file mode 100644
index 000000000..d14354980
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d759g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d759g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102f76064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4948bcc7d9b875d49825e93b51d92d254c817158954bb2a250c08dc6e3b6e200",
+                        "s" : "0x6da3633ba6b0835dfe1182f63e9e7714ff6f0c3753b0b869383925d8cd53e225",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d75g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d75g0v0Filler.json
new file mode 100644
index 000000000..21a1da2d8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d75g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d75g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x604b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0cb57653dfc0f94c2aa222ad1bc3cbbadc6f12e43e39e9b2b69b8cb85cf4db1a",
+                        "s" : "0x76db9a4467acf9ed6987707ad3e3f13fddbcc8061821047710df2ac68289c47d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d760g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d760g0v0Filler.json
new file mode 100644
index 000000000..273b375a9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d760g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d760g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102f86064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5f045ac1dbfb06f2a53dd94d54478e2aa898aa397214cc76b3d53128927da4b5",
+                        "s" : "0x1948b093ad813bff6375d3a5aed6c869e445759cf07b3de6f7cff322e9ce6c01",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d761g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d761g0v0Filler.json
new file mode 100644
index 000000000..9e3662a26
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d761g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d761g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102f96064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x02d672dd2edf582cf9e3d3394debbe60538f7f67c15c5ec2e83c011038680c9e",
+                        "s" : "0x6ae7cdbfa04b0bfca1a68b233365330c4075299e87be60db1d3fb36ca71eeb17",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d762g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d762g0v0Filler.json
new file mode 100644
index 000000000..6f1147fb8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d762g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d762g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102fa6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x51ab9d39734ae4beb67948581f8e13e4d4b9f2c8bc76fda3f9b6d531db54af30",
+                        "s" : "0x6851af66fa396279d4a949c478c049ef6dc9ef81c5c7abdd242730662a9739b6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d763g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d763g0v0Filler.json
new file mode 100644
index 000000000..153b75488
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d763g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d763g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102fb6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x08a64bf54a998d14a379abd2803d483812cb263d03f9a654fe9c0dd9449d767b",
+                        "s" : "0x33b8f922ef75603d308e1dc952863dd0555bc9112b3afe0ec8ff0ea427275d33",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d764g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d764g0v0Filler.json
new file mode 100644
index 000000000..7d5684f83
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d764g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d764g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102fc6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3ceaf0b929083e9a0fe2ca0c4f1a38295375f79b8eca79778232c243cd2b02ca",
+                        "s" : "0x79cdae45144d9f25ed45e2ee39782a255c871ff262a58646ec3b81a0ad0ede05",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d765g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d765g0v0Filler.json
new file mode 100644
index 000000000..060385e56
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d765g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d765g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102fd6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc8de8f53f9a3e5a4a14da4582c05a00f85860fbf2689df1492fae069470af927",
+                        "s" : "0x7685c41961c8d5bdcd695c74aa2614417eee44e25e323a73e4b7fc5ad647f180",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d766g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d766g0v0Filler.json
new file mode 100644
index 000000000..e397cdd9c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d766g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d766g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102fe6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe85919e9364f34d965249aef3ead3208dacd639d5810b8dadf6c307a249429a8",
+                        "s" : "0x24848b118d87a17a17e7dcc265bdb52ea221e086019ce747b213e765777d3d71",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d767g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d767g0v0Filler.json
new file mode 100644
index 000000000..902b16ae7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d767g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d767g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ff6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe8dc669402c3ab882c98ba8cf5fd39e266dc837430cf366122508e80fcd2fd3d",
+                        "s" : "0x68fa2736b2f8ecfd0cc94e55bcd768906d47d0fb4172c6c226cb8a9be46aa64b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d768g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d768g0v0Filler.json
new file mode 100644
index 000000000..d3a1a7317
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d768g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d768g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103006064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe72e06a56c1b3a98b3f6264ad83767b972ec31d374fae4033fecfa0532077a7a",
+                        "s" : "0x53bab7f8cacec1e9fe090763028a2f18eeda36cf49c65bf6c2a59a2eecdf96f3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d769g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d769g0v0Filler.json
new file mode 100644
index 000000000..346402f2e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d769g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d769g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103016064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x67b1a728335ebfbbe1c5bb30c091a7fee9b5a16c35b4cd89eb7b7c88c9b94b75",
+                        "s" : "0x324c91394ceb0a0587f5f76aeacc0a6e70c635c7b8583e787284dfa42a710ac6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d76g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d76g0v0Filler.json
new file mode 100644
index 000000000..821c55546
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d76g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d76g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x604c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb8030c0606aa8f24aecae83c20459d4c2a461609c97e4b7451893d762fb3e680",
+                        "s" : "0x4ad35fb6f5c30e8f647daf9a08bfed0eceec69472aba448b9361bc3c31b676e3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d770g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d770g0v0Filler.json
new file mode 100644
index 000000000..271bd05c4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d770g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d770g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103026064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x04d56740342e563e4250b75f75e7af0169c7d76242e73034e67ebf16f88900fa",
+                        "s" : "0x27718e3b3c581c851d8e60ba02feaae108f1b239a045ab71c7111309bce2f4c5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d771g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d771g0v0Filler.json
new file mode 100644
index 000000000..8adc1b2c0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d771g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d771g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103036064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd15602fa03ff08dd7c97ceb1116ec5cd668870b749c56417c5812a96432a5017",
+                        "s" : "0x4208604ce06cfb312b424d6b3f490bd0709938d70fe29a46f874fb0898cad5f8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d772g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d772g0v0Filler.json
new file mode 100644
index 000000000..668470bec
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d772g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d772g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103046064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8a3b4efebd74f39f7a543dabdfb8bad007e7d8722bdbeb69b26cc83918557d89",
+                        "s" : "0x59bc4da16e1a9118461249b3a764ff7ccaac645c9c88120dda224b1596d8b7fd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d773g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d773g0v0Filler.json
new file mode 100644
index 000000000..b5671312d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d773g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d773g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103056064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x896732f2e3c306edbe2495dd698def7452609e46ce0487ed1700347c0ade70ea",
+                        "s" : "0x3e294f64df0933aa85dd62a4e9f2399eb9fe18cc1f34c2154e967d4758191fc0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d774g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d774g0v0Filler.json
new file mode 100644
index 000000000..5cd68b8d1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d774g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d774g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103066064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa79d8c535beedc610b683a24e9f51b1b775733129730326223715aeb23b3019d",
+                        "s" : "0x73d8141dbef79a2f237ba19416cdf484e063760e2025dc4cada5c06b02e8ea48",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d775g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d775g0v0Filler.json
new file mode 100644
index 000000000..f2553de91
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d775g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d775g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103076064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x33105803e9d454b2b78f39226eff3ce9a4ef6f7aaef73e6885d60358686e3950",
+                        "s" : "0x547eff14fb0abbedfd781cbe858ce3bc3fa85daa2733c7e1aab16e20419f3786",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d776g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d776g0v0Filler.json
new file mode 100644
index 000000000..75df2077d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d776g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d776g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103086064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x061845ff290618f956c46f8e49ee5d1582102de12742bfa3f674d9ac1593938a",
+                        "s" : "0x689bae4a74473c25b9e9455092e04cecd2db51d7972c55aa4b25288bcd736a5c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d777g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d777g0v0Filler.json
new file mode 100644
index 000000000..c8b362d17
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d777g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d777g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103096064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdd454dedb1fd01294041efeb72ba0e327af57de6280659bf8cb3c50e34faf958",
+                        "s" : "0x7c9503e1543a543799d2d7107c1d75fd70a9f15f74047a48da2defae7f2895a3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d778g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d778g0v0Filler.json
new file mode 100644
index 000000000..311bab9a2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d778g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d778g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61030a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb1565878aae6a02cd4738155a8210bf80a7d69bbe088b4056c40d228db90725b",
+                        "s" : "0x465047480915fe3f314d457a1d02967ee1d59a2ebb7deecd2335ff7389d58d9f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d779g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d779g0v0Filler.json
new file mode 100644
index 000000000..ee549630e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d779g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d779g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61030b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8a5f656332c0db3875ea88dfc3feacd034e528f3f12dd784cb5f5bb56296bb3a",
+                        "s" : "0x3389164494d1047c0fbacbf59306ce3b787bc75042917dc1075c7a324bddb85a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d77g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d77g0v0Filler.json
new file mode 100644
index 000000000..73e93b072
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d77g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d77g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x604d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0a2e96796919a751cc7e2a10355129be94006334ff91b42c8c542cc7fac42466",
+                        "s" : "0x45f105e99f3e003b56aefc224866e624bb40601b3a725264c1d9fe2dcfaaa1da",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d780g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d780g0v0Filler.json
new file mode 100644
index 000000000..0331eb3c7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d780g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d780g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61030c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x375965ec9ff64f740454d329bf3ddaf44497d19da4ef6de83a6961376dd69408",
+                        "s" : "0x526ccfb9fb348344cb23ba9bb14bbdc4efe09967d1c87f1a8d4cdfebc20b378b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d781g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d781g0v0Filler.json
new file mode 100644
index 000000000..69436725f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d781g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d781g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61030d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x01374aed85aba391c540d22c80128bc3d482de41572278b48d2bc6f38df6bc81",
+                        "s" : "0x388769fb83cd0111b9e6973bf1b6ab49c88d00f71b473573e2a539596c70d968",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d782g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d782g0v0Filler.json
new file mode 100644
index 000000000..24d7143a4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d782g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d782g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61030e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc0d7e4087e6afea65a9a5537b73fa8d64e79abcabeff317111ff4974927eb55c",
+                        "s" : "0x353a24ee92ada82d5da62c2ab84a90392925f77295e645210c7b2b9db511c69b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d783g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d783g0v0Filler.json
new file mode 100644
index 000000000..71278e7f0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d783g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d783g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61030f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0b6174e8f253fded58be101fb89fcf87871905d3d54971e7cef4a054ed42bf48",
+                        "s" : "0x4ee6604b8f9050d17b7dca0ced417d825a46aa10d9dd96e41793ccc1f437b9ff",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d784g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d784g0v0Filler.json
new file mode 100644
index 000000000..eef785d69
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d784g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d784g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103106064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8bb15c39b69b5202e3f7ddfd44e842eed71a503419a0817633710077f684be06",
+                        "s" : "0x530b2e657b3306fc3a470e765ea188955aeabf1ffbb1d745555b5093645a10e7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d785g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d785g0v0Filler.json
new file mode 100644
index 000000000..9fc6d4da7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d785g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d785g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103116064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0867fedb6713a4f70d4fc28aa4b787758d9c45f6858adb1ff3e9eef9102fc081",
+                        "s" : "0x6b99c1a0e354eac61f67bdf89cfedc31a6a7780dd855b547c326a97300958d86",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d786g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d786g0v0Filler.json
new file mode 100644
index 000000000..b22bd19be
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d786g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d786g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103126064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x43359b7f2e6c15e89dc84c2e727c85dbf858410cac93fa4fef2e9fdc51dfa447",
+                        "s" : "0x3fda14ebdbd5e52c3824aea1a6d3d112524f283d656ca33ffb48a3350460d55e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d787g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d787g0v0Filler.json
new file mode 100644
index 000000000..3184e4102
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d787g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d787g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103136064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x662f667f1af79dbcf251520e73a0db95f2e07b7fee8351de0a6d86d5a0caeb19",
+                        "s" : "0x234bc5db44bba86b1ecc5e35d8ad089eabe5b9e3737d1db1294833927d01cc52",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d788g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d788g0v0Filler.json
new file mode 100644
index 000000000..f6b5b5694
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d788g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d788g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103146064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6f0f7366c4d02a4501e6f5d932efbf1873024350264b5270048008daf0568bcc",
+                        "s" : "0x614a65b600eba4991754d824dd870c6f60aafa21f48ab53789f65f43abdd47a9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d789g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d789g0v0Filler.json
new file mode 100644
index 000000000..354d150a4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d789g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d789g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103156064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd8adb6d33fe72f0b67d17c27d859f2a57cf2032ef89bd8d3e3ad7f055de4f4fb",
+                        "s" : "0x773709e96f1da21d0bd769f24d235be9af44a3564684573b26bb712a24d38a66",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d78g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d78g0v0Filler.json
new file mode 100644
index 000000000..6c4cbc602
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d78g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d78g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x604e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcc7dbd91b88d9462a68a679f7aada6806066c784297315867668045432c49163",
+                        "s" : "0x0e292ce71dac80373ab2d6143edcc56fe2388fe95e3f358fdada6caacd3c5820",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d790g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d790g0v0Filler.json
new file mode 100644
index 000000000..27763c529
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d790g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d790g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103166064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2620ac1ca6bafce1b8acb10b86699e767d310f2e6d0134aeb05f7531a6227b45",
+                        "s" : "0x43d111c6a176990b77b8783103c949a151e74b37a75db8297deb18c57b3cd121",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d791g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d791g0v0Filler.json
new file mode 100644
index 000000000..141e5017a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d791g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d791g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103176064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x05d636f7fd5a7cee8d1f7697edf67d94540ab643d7abc1917ac52bd41cf0da9b",
+                        "s" : "0x4bbe2af3605e0eed70d66d116b76d16347fa5935cfede0e262fb33f3ed2f4ad2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d792g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d792g0v0Filler.json
new file mode 100644
index 000000000..0d94aec49
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d792g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d792g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103186064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaa9426150879c058ba14bcf2bce1216116cc17fac8eb2acd131eab118c037c05",
+                        "s" : "0x1dc92f19209e64d62cf9e713e3eb182402d953cb90a2c9e1d5b5164a3ed62083",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d793g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d793g0v0Filler.json
new file mode 100644
index 000000000..bf5bd2992
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d793g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d793g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103196064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6c9c17bf5a63a161d1437f4cdb68b18bfe43ef315879ba5ed0edece885331127",
+                        "s" : "0x159a7ca0cfbd449efcbfd0e75008e3420b46c0ddcc57410e99a2cfef303b3d3c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d794g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d794g0v0Filler.json
new file mode 100644
index 000000000..b68327d29
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d794g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d794g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61031a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcfc8c94eb7c3993d1811359a9894340da8041989b6bd62ae76f951b55575d57e",
+                        "s" : "0x6d0207c308a485690aac505d1c6151938ae42ff7c1fe13be26f21e10f7ead39f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d795g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d795g0v0Filler.json
new file mode 100644
index 000000000..032249d67
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d795g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d795g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61031b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x697b15138fd48041019d3ddca9265b3bb01c16a56e5f0eb22b1e3e701cea18e9",
+                        "s" : "0x511c0afdf7b7af48ed92dafd0bbee28fdecfb8665c9d6fc8e2e93ab6af56053a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d796g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d796g0v0Filler.json
new file mode 100644
index 000000000..20fd70fd2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d796g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d796g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61031c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2a895c391908920a44f00b396a0b286c0dfe38d1c2ac9a195f2c546a69528514",
+                        "s" : "0x5bbd7e40f263db9883569b8d15e99446263d5ef0eaf497f64a7830ae060d7b42",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d797g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d797g0v0Filler.json
new file mode 100644
index 000000000..90b7efea2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d797g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d797g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61031d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5e723a43681eccb07565c4633bf4d5abffd1cdf4d833201ecfdd921ba602c922",
+                        "s" : "0x04c928961cd2322f325f25c346d7922deb180445921371adbfc6c19438602453",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d798g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d798g0v0Filler.json
new file mode 100644
index 000000000..daf36312d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d798g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d798g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61031e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf4f5054c39ff9399b2a96fcad2a603af886f0a988d65bb276e7443fb32d9156b",
+                        "s" : "0x41e48876ccf61b9f634251f5eea0169a07b39e446176f90d9e9d1f5c526614fc",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d799g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d799g0v0Filler.json
new file mode 100644
index 000000000..b157c81a8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d799g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d799g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61031f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcc7cb02dc6fda998105d1278b025f0475847bcc9b382d19a6b99dd93d42a790f",
+                        "s" : "0x30766dc165b251de1efefd59d7cfca2163282092f146fa2011c65e15f3460515",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d79g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d79g0v0Filler.json
new file mode 100644
index 000000000..2276807f6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d79g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d79g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x604f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x762ad647f967967e61129289e50883c7518b56990dcf4fc79e6975c9adf5dd65",
+                        "s" : "0x50414e612b249c5a925ad481c3dff5acf58907d14764a164c9a6e01da3760ba2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d7g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d7g0v0Filler.json
new file mode 100644
index 000000000..f585a0076
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d7g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d7g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60076064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xde33fe205412721c4926d9093efab062eeb680d4dc4697e9aba89779efaf64ec",
+                        "s" : "0x1e8e1a525ad834d786444f779d674e18502ea078c45d925d8d470ecc2e81b850",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d800g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d800g0v0Filler.json
new file mode 100644
index 000000000..6330dd53d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d800g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d800g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103206064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf3e76b4cdd10d9fce8b13c67e60b72f8fba4b686330e5cfb503daf313f90f35f",
+                        "s" : "0x60acd69da3b6623a18a353d982dbf716bda91117f8b5d49904d8e66556aa51c4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d801g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d801g0v0Filler.json
new file mode 100644
index 000000000..7bac6d643
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d801g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d801g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103216064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd0fb15fd71cc7a73e9dc315cf073efd843bae7b5e8074dd5c68e703de657c17d",
+                        "s" : "0x744baed188927a27b9acbf7deccecbe4a18d02e02cbd90dcc34ec2cb278f3fa1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d802g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d802g0v0Filler.json
new file mode 100644
index 000000000..bd76a0766
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d802g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d802g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103226064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8bfe567eb6aebadeabf15338e46b4045ef3eb1868a9e94cf80bd34ec078b66c8",
+                        "s" : "0x18da4cd9d1f5a71553e32480d6f8570921f1eeb432492120a126fc70b18bfbdf",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d803g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d803g0v0Filler.json
new file mode 100644
index 000000000..8c599d1bc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d803g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d803g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103236064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdc0176c95e90b3c8b2a36c86582820f32655e1bca16ae80306e7834321e48bc5",
+                        "s" : "0x257bdd2b67d04499cfbab828c59011bdbb18097237af738a4c6da10dfe97ba23",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d804g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d804g0v0Filler.json
new file mode 100644
index 000000000..a939a474e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d804g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d804g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103246064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa1557f25237e47257c37f546a1bf6357f304dfb4bc75e8684b76938cbff98f24",
+                        "s" : "0x3440b811149a6052d5ee4d9dfe79998d519fc3aa677b595f2b1d588e05d987ad",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d805g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d805g0v0Filler.json
new file mode 100644
index 000000000..3836ebd2e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d805g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d805g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103256064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x50fefc06306123b0167f12cbad2a18f6cced9db99b39c322d808cac62d0395df",
+                        "s" : "0x2565c2358e67c1f278924d691ed8da3623d25cd8097585403348a8beb575a6e7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d806g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d806g0v0Filler.json
new file mode 100644
index 000000000..177f91199
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d806g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d806g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103266064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xadef7d429363b575c6b3b85a30e16f4080e8635b84e16388a0da4d6b629e93b1",
+                        "s" : "0x29f6fcb310c27e8de08b791a033b8e069bd071c25a373fc4b3083535fba7a9dc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d807g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d807g0v0Filler.json
new file mode 100644
index 000000000..e07327444
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d807g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d807g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103276064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9914fea5e28e3c06eb9b85af4d77b58a00f65f0afdf1609093c3edb9011c5128",
+                        "s" : "0x3a7da956f7ffdbe61dad9f2ca7c476237a8007607ae2c49db8efb6741f78c0ec",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d808g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d808g0v0Filler.json
new file mode 100644
index 000000000..b16225df8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d808g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d808g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103286064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x86730639d4821e32426df1c1b76eeb8a3304c306d95148cd7e9dd74c17652fc2",
+                        "s" : "0x778f9eeedc90752df2866707486bc6a270291a02e3ddb5c0a883fb4658c84298",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d809g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d809g0v0Filler.json
new file mode 100644
index 000000000..d1f419e2a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d809g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d809g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103296064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x06d9a60bcd1b3756e903b6fe7923614956829dcada6527b5a543fcdf4b98497e",
+                        "s" : "0x7ff9aa57c5d0f43ed31009647a7597d5ed710f6469552aae785fa7afd2666ae3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d80g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d80g0v0Filler.json
new file mode 100644
index 000000000..554904bbc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d80g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d80g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60506064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa4a23e90ff95a3bf98042064ee3860c87fa87dd77b95c4b25d3a99ace65b5f14",
+                        "s" : "0x29e297cb91bfe557932a90265c7cc16f8164e04167c3fc56476f6f67862cae75",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d810g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d810g0v0Filler.json
new file mode 100644
index 000000000..eaad45e08
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d810g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d810g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61032a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6961bdb8df720fab8948c7b0cf9d98dcf1b5545fbec05a5608bd637d07fbc644",
+                        "s" : "0x555093e7b2cc776024a6a53565b9ae7d1405202b2494516714ce81c6f63a0cf5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d811g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d811g0v0Filler.json
new file mode 100644
index 000000000..0741978bd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d811g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d811g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61032b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcc471eafb11e62e323a23442a9d3362eb03766a54213ed818e7f943a4505dc11",
+                        "s" : "0x0c3cd7ae0d2a8c63181a51217299eb4a30228f303116d69c2860cba61196cc02",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d812g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d812g0v0Filler.json
new file mode 100644
index 000000000..a762c7ad7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d812g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d812g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61032c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x432867dd64cb0bcaa273be13b18d37d387a5178ab5c9b5da0aa370409e556799",
+                        "s" : "0x019837c46332a4339909a1bed07e775120f03a22fb1f7c7fee9150a7b8bd3d9a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d813g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d813g0v0Filler.json
new file mode 100644
index 000000000..cade5ac35
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d813g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d813g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61032d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x50d0b29f3ad298e5ef59f5b8b5900134f13088dde3d0150e9bc09168b7a79227",
+                        "s" : "0x5e7369d7b76aab94db8710b03403c487ddbfb059c48058134d01db0199e37b7d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d814g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d814g0v0Filler.json
new file mode 100644
index 000000000..5b84b573c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d814g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d814g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61032e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4122bf163ed8de1ace9d71c8c67fbe1d5d80580c30484e2e1ca8a96d28550f43",
+                        "s" : "0x2abc3a4ebc43dd597f97b1ed31aa3a2b83330e629efd62631cd4c4c05eba3e84",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d815g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d815g0v0Filler.json
new file mode 100644
index 000000000..f245149ed
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d815g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d815g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61032f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfb14e368faf87e3ed397a358e12bc2c98e178e8a6537f95a9eaf4555de3a905d",
+                        "s" : "0x75e546a3309a0bfec7e06e4ec27808954273fc4c25f446db22d28d8988b889ed",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d816g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d816g0v0Filler.json
new file mode 100644
index 000000000..566153982
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d816g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d816g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103306064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7b9482f104f6946c526e9785881ec35713c90c1938ceb9d29136879b24d12ad5",
+                        "s" : "0x4e6343426c00ab0b4a55db2541ecec7b32cd4f367479e062a1ad4fee2e1d8ab4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d817g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d817g0v0Filler.json
new file mode 100644
index 000000000..1e5303819
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d817g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d817g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103316064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xac22e5e7ca71f8a35feb2861fec52c652cb66af0081c4e834e55df09757c33b5",
+                        "s" : "0x49de0d0ad2c23f71663a56b162011f7e974d3bf57a67fe3fc30b85110bc454d8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d818g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d818g0v0Filler.json
new file mode 100644
index 000000000..a20abc5c3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d818g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d818g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103326064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3fcc57a748c937f26af74eb4733a597cd70d02d688b92a49d8c443dfaa2facb1",
+                        "s" : "0x42221aa075313b9257ec4919ec1a9832df862934ff7f5e0706e55c3c93268294",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d819g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d819g0v0Filler.json
new file mode 100644
index 000000000..164da101d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d819g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d819g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103336064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd495fa694b90a44c8b1fee2a50096cf38b1cf86328eaada3fffa929b7a684cf8",
+                        "s" : "0x7474ac5b935952b6fdf6de4c8a6c05102722e189f66eb34eb6cde5022c6d37fc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d81g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d81g0v0Filler.json
new file mode 100644
index 000000000..45802e63d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d81g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d81g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60516064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xda556c67b1dec2cf0d05b22e958f70ac63d78a52fc869d64b88ebdf964348256",
+                        "s" : "0x729be0cc44367e30b8b873956413d4dcb0055ad98cba97cfe3f9243aad22bd62",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d820g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d820g0v0Filler.json
new file mode 100644
index 000000000..31a428d13
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d820g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d820g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103346064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc8a66656f8fc569ae1ce77c312963c8fe18ce462a6ca96c3b336c08ba0f03fb4",
+                        "s" : "0x5bbd720a41f7e1c1087bda0d4a5e3ae45ca25fececa1081fbe7e1958acd582a2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d821g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d821g0v0Filler.json
new file mode 100644
index 000000000..f3dd4077e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d821g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d821g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103356064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa0ebac220e2a60482b4f07440652c21a1bb245d62feee4c2be512d6a1481c317",
+                        "s" : "0x7ebbd34f4a34f4fc6e0618139d7d2f3285e269222abb7aac85ec93f2d1ca06e5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d822g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d822g0v0Filler.json
new file mode 100644
index 000000000..2492ac120
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d822g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d822g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103366064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc1f1f23722b0da0c3e9db7e1985bfc1fecd0ddff9459be79697226a6a1b0fc44",
+                        "s" : "0x43f34f3fd16ab85a293bc3d9b82d13d1102343f083fa25e1cc6105fc9644bf43",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d823g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d823g0v0Filler.json
new file mode 100644
index 000000000..a3d8a9107
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d823g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d823g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103376064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x29a9e7c324effab5cbbee2f6243c3a12c16236d548fa3a50bb1e61a4ca859c19",
+                        "s" : "0x7d563ef9966433c3badb0028aae9eb37fe6dcad71c7b3975076c1b377782a1ec",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d824g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d824g0v0Filler.json
new file mode 100644
index 000000000..2c26009a4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d824g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d824g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103386064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8ede3a8d337b041f5524bb3fbabc96dc1b7d93766fa8b86e287da9283cb05939",
+                        "s" : "0x4fb6528a28c6ef0c88af57a0d7d6efaccdc96d3f7b7bdb9272749367faea61e9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d825g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d825g0v0Filler.json
new file mode 100644
index 000000000..e064a71f1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d825g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d825g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103396064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2c3b74bb26eea539a1ae8d562ebcef9159eda140b520b61fe79b8bbf09213575",
+                        "s" : "0x15130487383541a1cc068917c63170f4278429407a5968013cd02f757b203866",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d826g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d826g0v0Filler.json
new file mode 100644
index 000000000..60d51d7d1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d826g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d826g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61033a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x40bf0ab820f3d051764d5642935c91bb9d685de4045998b41e9644400284dd14",
+                        "s" : "0x0c33a3a4d46d310f7472a74a035f86be689fc1a77b5cc24e92de5ab155e08c64",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d827g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d827g0v0Filler.json
new file mode 100644
index 000000000..09c789658
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d827g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d827g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61033b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3c062acaf764951d6de0004120a94f8e95dd7fbe1f499b886b31d69f7775ae5e",
+                        "s" : "0x55d205fdc6792d7f094647ebe148b08a93b130df0d3bccd065f7e2a9683997ef",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d828g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d828g0v0Filler.json
new file mode 100644
index 000000000..a4fca43e2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d828g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d828g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61033c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x72015f6ef927c40267fe6bbab5edbbb26538fddc526b24a45da053e459e164c7",
+                        "s" : "0x100f86eba1badcdd83d8170b6ffd247d29c2a44209e8f4f9efdb7da3c5b54f16",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d829g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d829g0v0Filler.json
new file mode 100644
index 000000000..73e81db10
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d829g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d829g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61033d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7dc0595da1841f8230666afbc7b103b2da64702762a3efbd66a8cf7bec55bb10",
+                        "s" : "0x448ccb5716cc61cdb9a59362a590f1d435d0c31f95352b296ceb69f1fb1014e5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d82g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d82g0v0Filler.json
new file mode 100644
index 000000000..00ca05afd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d82g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d82g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60526064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9c70edb9e22176d79f5affc13963f0d1cbbdad4e143b8d38813b1cf5d19ca73b",
+                        "s" : "0x3e826acd2cc04a5c20cdc5ff6095a9993dcc66c0b840fb0a4630765071363feb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d830g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d830g0v0Filler.json
new file mode 100644
index 000000000..7ff7073d9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d830g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d830g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61033e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6ecf00ddd568a823ba8b6bbff28a08ce1d16f15a5d88d3a2489a21fe7d110c61",
+                        "s" : "0x720ea9d1c8fd245c0b468b0d9aa0db1acc59c0683ec9454cd291ca704b8b92a3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d831g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d831g0v0Filler.json
new file mode 100644
index 000000000..238cc6aa0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d831g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d831g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61033f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa76b007518b3b007a7b36e40a48c5f8adf5de18fa2bf57cd0e64ebb58c9cb5e0",
+                        "s" : "0x7188380eeda69133c28279c4f76f1b8234b0f44b420d48db32319875c4671d48",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d832g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d832g0v0Filler.json
new file mode 100644
index 000000000..6d3b2af2f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d832g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d832g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103406064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9ea05e67a5aa57869233b30418d1463efa4ce72073852d6e51578e4d89a8c67d",
+                        "s" : "0x1e361b7032908fed99107f647fbd9cfbf9e2b7cd72bc1d12768f07e8111a9214",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d833g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d833g0v0Filler.json
new file mode 100644
index 000000000..60ccbf192
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d833g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d833g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103416064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3f005fa44b81c3d9a5821253f39ade7311bfd211bae6cd7525a37c5feb362726",
+                        "s" : "0x0ea63d946cf3f4e28bf09bb52dbbb33f233b0923ac5a28716d11514fd8256051",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d834g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d834g0v0Filler.json
new file mode 100644
index 000000000..d79b1e470
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d834g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d834g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103426064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2331a6859093b3fafe6b37a67f7ba96fc681b25d52fd13ab64f7e8a99548aa44",
+                        "s" : "0x1c4bc43f114587e9c61bc5602cc53b79ac38a9278f998f7e3dbcd529bbca99",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d835g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d835g0v0Filler.json
new file mode 100644
index 000000000..89ac94cd8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d835g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d835g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103436064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x76457680b89f7884215ce527a247ffd02e1ef97b5510cb7321fbee89df358a37",
+                        "s" : "0x51ceac79bea99969deeb4b0b480829f9136bb34adea966856a2828a9998ed6b9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d836g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d836g0v0Filler.json
new file mode 100644
index 000000000..973fe59a9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d836g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d836g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103446064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xee793c6a27806b534bddbbf2e4727b110d78efbe3311442e3acb05fb97d1f71c",
+                        "s" : "0x561e949967949013bdb288f99465b497243c654adc1b586d4b6703deb9d0ba16",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d837g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d837g0v0Filler.json
new file mode 100644
index 000000000..4ad11ba7d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d837g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d837g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103456064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x44be80348591d987625baf2f343cdef340783229cb4646a5783cd7658630de52",
+                        "s" : "0x96f8369f809ed71669331fa53563bbf8580110e5710ac8d77d110767b84cd1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d838g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d838g0v0Filler.json
new file mode 100644
index 000000000..2764cab60
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d838g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d838g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103466064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9d5bfe088fb1667d3e9f4a18d7b5dcf8ea15e810111e9fc41ac1a7daa9e0ab4b",
+                        "s" : "0x5671d24cf12c03c3aef26b90a6999204d7ab947c1262ece95f0686a1717001fc",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d839g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d839g0v0Filler.json
new file mode 100644
index 000000000..413701f55
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d839g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d839g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103476064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb7e367247ec794625132f22122060345234fb87c2e8fcec4d40b66b10c053c4e",
+                        "s" : "0x31a7e679d9defdf2883a76a3996b7ffc2b5320564aa78beb9f538312c25fd086",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d83g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d83g0v0Filler.json
new file mode 100644
index 000000000..7e093fc77
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d83g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d83g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60536064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa35e935c86d2321e3ce339fb2d28600294d597382154e7c9ef18374ec638a1b3",
+                        "s" : "0x703a2b0279ac864735eddfc275dbee20e5101795c292a790390e0b58758be0d3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d840g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d840g0v0Filler.json
new file mode 100644
index 000000000..5229b72b8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d840g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d840g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103486064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd241ec1d0ada775c8b8f54e31bd32d645cc4c1ae7979f6fe9de5bb9b3d3da882",
+                        "s" : "0x7db4e67ddba62d85ebb3386b969eb86aee0b69422d16d2ce2241d5cadaea8b1b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d841g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d841g0v0Filler.json
new file mode 100644
index 000000000..26fd20c54
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d841g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d841g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103496064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd338ceeff385bbf6c865653d2e0eca6efcb290f93f0186e73d96478fbc76d2e9",
+                        "s" : "0x706447d985ece6ab38e56a577ac6db4751330ebe49176648b27ef30352a5e778",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d842g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d842g0v0Filler.json
new file mode 100644
index 000000000..27dc1cd4c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d842g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d842g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61034a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3192c9237119fe02f51f1fb27dc9857008d21fa6e41acf4b1438ef3e3d59959e",
+                        "s" : "0x24ea217ec952da51c82309b21042220591f438c49716e25a99b4139b60ff7a38",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d843g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d843g0v0Filler.json
new file mode 100644
index 000000000..5715be0a7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d843g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d843g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61034b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x559d5003f5066ea4419d4846885d305812656e02a43a8d7ff022e6fc95486e11",
+                        "s" : "0x58c6935f201047f7954051a23c9803d3796dd50393b6127e6e2a91a2355dca10",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d844g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d844g0v0Filler.json
new file mode 100644
index 000000000..2dd039214
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d844g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d844g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61034c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2638bcf9be999c2904b769f7567ec5b524a3e3a93c4a58b76917dcb6e6bda034",
+                        "s" : "0x3a12b386dcd528e03f3593ffd8eb3d8d7737aa15ee0150a12d2f948397895bf5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d845g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d845g0v0Filler.json
new file mode 100644
index 000000000..be1a60691
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d845g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d845g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61034d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6f27aef42f07a264960efb944a6acc3b75509c7d670b79cbf0f44cd38d6cf2b4",
+                        "s" : "0x412d39b27d30ebf505e353912c01eb1e5e1bf49e53e16fc1ca202620f8521a46",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d846g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d846g0v0Filler.json
new file mode 100644
index 000000000..5aa016876
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d846g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d846g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61034e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9873533ea79848894417a3a4041615520d454f285c2a5eff598e7ad4987f1f03",
+                        "s" : "0x42e3069b41fa6db28c41136b6867f196aa4654e4b7d83fab2cf67115f70109e6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d847g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d847g0v0Filler.json
new file mode 100644
index 000000000..1e730e4d2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d847g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d847g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61034f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb764b77dc981505d7081507fb2a186581dd4ad988fcf2665c159c3b32a194cdd",
+                        "s" : "0x7abad85a4ed5d09689cf381588e9ea37beae19a1129817f37b68495572e47b3b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d848g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d848g0v0Filler.json
new file mode 100644
index 000000000..899912897
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d848g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d848g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103506064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd8709f0135752307959621a882d2388cd6f346dd58ddfb0c97a304ed6b6b46c9",
+                        "s" : "0x6ede91fbf58c8df506acebb071f19891d463a5ae10b41131bbc087fd55fa5667",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d849g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d849g0v0Filler.json
new file mode 100644
index 000000000..9cbef6302
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d849g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d849g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103516064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9702ea94485f1e78e3973fa9458393900b769e83fc42d88b30344045e6c6f66d",
+                        "s" : "0x1dbfb5eb265efb0d4fdfcfb597f32dfd9e693b4d2b07242b6211465eff2fc8ac",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d84g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d84g0v0Filler.json
new file mode 100644
index 000000000..e3d8fb45b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d84g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d84g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60546064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcecc2bba93eeb93292114bed38d836aed5411112d65559c85b3cbaf69a4123be",
+                        "s" : "0x6a9b74a8b15a01d014cd5f650d65b642b52f9d92e0238fcf3d7bea85321d0e3d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d850g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d850g0v0Filler.json
new file mode 100644
index 000000000..085b3de85
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d850g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d850g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103526064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbff7e411cab39009ee3fd594881fd5fe0a91cd3c6e8e238ecd63d8e3611830b7",
+                        "s" : "0x2aaaec3d8deb72e4739c63dbf5840e26e545151a2a11feadd62f81880b7c8248",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d851g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d851g0v0Filler.json
new file mode 100644
index 000000000..3133b8059
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d851g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d851g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103536064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x435e5512c9b3e6f8a0973fcd579d7bfd80b9de3d1ce26c36f56bda6f5656701b",
+                        "s" : "0x7a07723488879be57d383dffbca5370ed40c548bbfb9e969df9e6fd6a3740bac",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d852g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d852g0v0Filler.json
new file mode 100644
index 000000000..c9ae01efe
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d852g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d852g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103546064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x799a57cb7303e3ed310d99e439a8c97994ad3f4b272382f67763eafd7485a00c",
+                        "s" : "0x4fd5451d1aacb1308e88868d94efd6c4a81087eedaa82ead37c6e9cc91c119ef",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d853g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d853g0v0Filler.json
new file mode 100644
index 000000000..fbf4d959e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d853g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d853g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103556064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x32e35d463480757f3448b460e62f09654cfa2c0f29c8f0122f5cae441547c557",
+                        "s" : "0x7058cde00b644553605aaa7ff26483f4f8a4ab2899e1b6943846e6013ecb95a6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d854g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d854g0v0Filler.json
new file mode 100644
index 000000000..2f18d29c1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d854g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d854g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103566064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb9e6568959c0d298b08ec06f3d9f530cd9d8081d857697c0b57825765558e5ae",
+                        "s" : "0x23b230bc3c6b20c63967c232b2d27e4db65a7c41bae933ef63fe176f55b7ad68",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d855g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d855g0v0Filler.json
new file mode 100644
index 000000000..cb3a1abf5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d855g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d855g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103576064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9b03b1969b86e839793848067c148fa7f320a85740f0639f83397849fe415586",
+                        "s" : "0x35198792ac9d98b5e5283a26e13d99d28f72b1a4c0b14cb7e5f25fa986ee8271",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d856g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d856g0v0Filler.json
new file mode 100644
index 000000000..590ff1347
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d856g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d856g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103586064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d303f931463de4d7a784b9454323b08ee559221cd90f4c896e4571db9438443",
+                        "s" : "0x22a3aa37b0d8b46b14de8560ecdd8c4ffe92add717f06d6dd715ff2d83291b37",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d857g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d857g0v0Filler.json
new file mode 100644
index 000000000..6a59b3050
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d857g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d857g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103596064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x29fc5669b11aafe66a6b521ddd1e2104664ea140ef527e10fd9c746f0e3128a6",
+                        "s" : "0x0deb5b411c65a77c9f6aa62b879ddea65ddc670696b6215434af32af9271c615",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d858g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d858g0v0Filler.json
new file mode 100644
index 000000000..5e74418e2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d858g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d858g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61035a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5984e380d9189d3e1e741b14ea4dd30cd380b8760821700f2be6cb90026d1f4f",
+                        "s" : "0x07b1dc2bcc5b50d7635a6ac76874ef686af449315ee7f2eebbe98b53fa110ef7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d859g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d859g0v0Filler.json
new file mode 100644
index 000000000..5f0d764d2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d859g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d859g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61035b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4e0e3fef19c39176433a4f586ce56e9008d304b1850328275e3f69770a82ef62",
+                        "s" : "0x4fb582cfcfdcebacc3c7791c06e501622cc0537479e18d2b0771c179dba4d09b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d85g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d85g0v0Filler.json
new file mode 100644
index 000000000..4ed33dc8f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d85g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d85g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60556064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xacbc53ec8f5a0a1b73c9fd9cd79658bf3bbe1d3659a834c4e0821bf6b68030b2",
+                        "s" : "0x4a24cdf3661d5936473d33d7994c0fb6e109b518928ca78bd7215dabf4e7271d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d860g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d860g0v0Filler.json
new file mode 100644
index 000000000..725ca633a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d860g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d860g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61035c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa80127409ba455ba62451bf7bcb42a3960c469fd6d7fbb09421a4dcb61a2c84a",
+                        "s" : "0x5f1a91c1cfe664f4138f4425caf6c4d45b9f5b3a64bde242e4b33b50cab441df",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d861g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d861g0v0Filler.json
new file mode 100644
index 000000000..eb8c58391
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d861g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d861g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61035d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0ea147cf3ece6c40a97cbe1a6d64b857f43a73ceddf0a3bdcc6e1d454b0fcaf9",
+                        "s" : "0x7facc18aa4d9b89d3b11708cc26fc622c83867d11c493e54e7fd70461b39e93a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d862g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d862g0v0Filler.json
new file mode 100644
index 000000000..14785a99b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d862g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d862g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61035e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6ed8e820dcdde1d085c9659d26653271e3e45560373aec8aa64896fcbb60c6e4",
+                        "s" : "0x4898c53455e1c6a7f8ea0e35d482bd746c6b3615ebaa69ebb7b5c56d0153f920",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d863g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d863g0v0Filler.json
new file mode 100644
index 000000000..a662be081
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d863g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d863g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61035f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x767d3d4c79b4f2397655c78670333cac97c708297cae05bbe8575750f897752d",
+                        "s" : "0x0f8ea18cf291695dd49d5c6cd864bc96dc7abba8f8e9db034232a4718340309f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d864g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d864g0v0Filler.json
new file mode 100644
index 000000000..603bf17e1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d864g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d864g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103606064526000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xba885e4557f71175b411d45c6e4a2c2064c168e17d5ea37f88ce2a5158eab41c",
+                        "s" : "0x3949baa3fe96c2bf6c5a34ed91cdf427f11826a70e53bb3861a2d380f1089b27",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d865g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d865g0v0Filler.json
new file mode 100644
index 000000000..8d530ff1b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d865g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d865g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103616064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xddab8701933074ee4306a3daa2b0af35cd344347272259a7fc6c3d975facb3dd",
+                        "s" : "0x0142ef65344b4397508778582f6bfcc8b5ba59b2db0bf402781a09a1a8afa7c0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d866g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d866g0v0Filler.json
new file mode 100644
index 000000000..4e063f459
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d866g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d866g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103626064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3fb15b256d04f0545ee3e330acf2c157536a4e7861b698644c99f6b63af46d4a",
+                        "s" : "0x78814a602b119e7f41b851e774442584011541d97020b46aaa9fc443ca2901ae",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d867g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d867g0v0Filler.json
new file mode 100644
index 000000000..c9cd813a7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d867g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d867g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103636064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa63d0fda723e3689e1bcd8631eb17350b2614c4b71c63cc40f9983c9c6de6611",
+                        "s" : "0x68b123918e230762a20f5095f3b7b1a149afbc09effbb82fd2f468ca6369647e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d868g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d868g0v0Filler.json
new file mode 100644
index 000000000..e274bf7ad
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d868g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d868g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103646064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf61e10ea169bc3aeac80b32cb3e6e7375889fdd8de6027605ee4d1117d67f413",
+                        "s" : "0x51e5b1a6207338ab58c8c752a8dd3ecab8e4dc59c0d00676b53f07b1d5012500",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d869g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d869g0v0Filler.json
new file mode 100644
index 000000000..6c266aca3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d869g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d869g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103656064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x24bee4c3fd535eb42fd94773758166ce7bdec9219b94e6e85e1c8de48da3bf59",
+                        "s" : "0x029ae732d2c44dc6060117e98026201edfbdbc07caeb0886323272f79b86ea07",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d86g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d86g0v0Filler.json
new file mode 100644
index 000000000..a3e07329d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d86g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d86g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60566064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf86a204adca0fd89394eed4c192d7922cf8797fe4dec79e9e9096b087b3f7756",
+                        "s" : "0x0e4f06358b5b404e3531937d7c61c1e7230015f25a3773a26a9770a3da679c15",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d870g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d870g0v0Filler.json
new file mode 100644
index 000000000..e83296bbb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d870g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d870g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103666064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x06d25f8bea418875cf9f8af5d86578af2a8d2d34b1f6e03df60292e020086b99",
+                        "s" : "0x4ffaa469f99f06b3f442a91290b85b19ff878062dc7114c2e1ea03df05747283",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d871g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d871g0v0Filler.json
new file mode 100644
index 000000000..b3387a740
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d871g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d871g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103676064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x200ea4347eb42b23b1b772a032349b98e4bbfe9d35df42167d5bf3456995a6ab",
+                        "s" : "0x5679e0f854573847373c4a9df048c89ce6dfb7e89ee8d87018145984369df1d5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d872g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d872g0v0Filler.json
new file mode 100644
index 000000000..d1a84d80d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d872g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d872g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103686064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdfa6eba569f7366c558bec54b5d3d27792b525afcaf7fc1dcac4ae56e919c091",
+                        "s" : "0x2bb3ee19482c0fbb8ebc7604dcbeddfb6d2311639f0f31abe6de7f199e86df53",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d873g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d873g0v0Filler.json
new file mode 100644
index 000000000..17f79ad69
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d873g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d873g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103696064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1d0b1ba738fea7b54254b44c105f5abfc7cda79aea960769ed332eb0085659ae",
+                        "s" : "0x5ed0a03226c0dbc0d1a0fe12a73d99a2b0a3eeaf3745f66cba89ecf65ec25477",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d874g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d874g0v0Filler.json
new file mode 100644
index 000000000..154c41e96
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d874g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d874g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61036a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1cbeafec29dab6e2c5e1e8dd215669af78ac56e0ae680f4334b06bb9d56d3cd8",
+                        "s" : "0x4015de49ca71cb3f92f7847f221d7d3311aee6b3bb666a18f8dd36ba40f00d94",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d875g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d875g0v0Filler.json
new file mode 100644
index 000000000..2d8ac52d2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d875g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d875g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61036b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa8a260c496501ed5a63308de95abd36aa269d93456265ac4b8295c730ac1e22e",
+                        "s" : "0x530636d68aec16210b5bc61d647f596356646446525eb53fb84d667211f7334a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d876g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d876g0v0Filler.json
new file mode 100644
index 000000000..da0b01dc8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d876g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d876g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61036c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x637579e97ffe4fef108c149fadccff558817d7bc92c9bc4d4d1b8531f7d9adc0",
+                        "s" : "0x267fe02f3d64dddf2339d858aebc82779c854ace183b6877f08e28aa84072193",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d877g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d877g0v0Filler.json
new file mode 100644
index 000000000..df8150bda
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d877g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d877g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61036d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2299951d4284ff6c104ad3657d45baabc11345c2ecf96b7dee26c52a2961c47a",
+                        "s" : "0x14eb48f33ef993b7bc9f98a63a013979d8295c8387f74265a51efa2997d89169",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d878g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d878g0v0Filler.json
new file mode 100644
index 000000000..1e1aae897
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d878g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d878g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61036e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x02d37217c4b7ad762aa587aff21d6076298ac83e97c0d89e5cb7cdb52d7dfc25",
+                        "s" : "0x0647032dedd947220064f465db5d2cf1a4069e5be6cb27c7a6d6f9d72a76aa68",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d879g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d879g0v0Filler.json
new file mode 100644
index 000000000..83198a8a4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d879g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d879g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61036f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf78cbb357c2cb992aece6c57809c0221fb0fa08d85918e7a20c049e105157e49",
+                        "s" : "0x08eb4988c563fe56c2dd50330a83b78a662587c4f5f1f3e03b670eb203f1f520",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d87g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d87g0v0Filler.json
new file mode 100644
index 000000000..0efefe52d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d87g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d87g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60576064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1122a8988b9ba1243299a4cc3ab3f6a6c95631c210e8762a500c8ae3bd1275ca",
+                        "s" : "0x691cb8a7fa544c658a0e57849c70419e532b36d38db8ee75f68beca77d8f7369",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d880g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d880g0v0Filler.json
new file mode 100644
index 000000000..33e183b57
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d880g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d880g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103706064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9818379b5fbda5f518d980361444566c492ec6027b3897ae8a39655a506e3038",
+                        "s" : "0x7523bc4bf521725695099b6411535e6c9122fb245b6cee29bd5f8459503afab7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d881g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d881g0v0Filler.json
new file mode 100644
index 000000000..e740731b3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d881g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d881g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103716064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1a6ceeef1d91d3412f6e6c10a71d38d8cbd5398f13e286319203231132c081d7",
+                        "s" : "0x2ddabc4b414417a2e59cf0c025f44389182f19ce68326d35e120e02ae710d031",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d882g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d882g0v0Filler.json
new file mode 100644
index 000000000..f89c4e306
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d882g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d882g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103726064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf0104bf2092bc4536a61b7272b761afaf78d5ed8c86cdcf57941fc8ccb67ac41",
+                        "s" : "0x5144d53cc0b224fd27fd172dd2787807aa93c28fb0a538fd6c0da1b97f2a068e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d883g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d883g0v0Filler.json
new file mode 100644
index 000000000..d63978bd5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d883g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d883g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103736064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xca8684f62437023f936bba6ba6527b90034e1a14f42ca2d69e825c000ae3b695",
+                        "s" : "0x5b449c4ea2e302b744992e2f43f879c2ca715d3fdc6621e5db7799011ce93c01",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d884g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d884g0v0Filler.json
new file mode 100644
index 000000000..159158399
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d884g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d884g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103746064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbf29d162c8aa6efc7beabcce003145ce0007faa2aea526a3ca3d908cdc9c1426",
+                        "s" : "0x462a517fa5445bd2acad0a675e014e56d516528abce87739e4549ac6ec137816",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d885g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d885g0v0Filler.json
new file mode 100644
index 000000000..18d7f9588
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d885g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d885g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103756064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x980891e60769209f8ff468ab2e1118ec3f543cf393ba3b0dae223315c2806796",
+                        "s" : "0x70fe021b28c4df257feaf7ac5faf6c57165c7f683452951a3124edda3bf8103a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d886g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d886g0v0Filler.json
new file mode 100644
index 000000000..30b7e2114
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d886g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d886g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103766064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8a2e4b38c67b940d55282b55efd6082b86860c967fccb68e78fb15bc4e6a697d",
+                        "s" : "0x64860850057bca9710e634358ae1a3e8bd5fc231930429d4c830750f8c49e5ea",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d887g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d887g0v0Filler.json
new file mode 100644
index 000000000..86bdaaa44
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d887g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d887g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103776064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x167d91152b53fefb7512b40d279704a579a8c562a5a54c094a45f244eb2ab969",
+                        "s" : "0x2924e32759d7a432c4eec35733754f9e6b9a8ef40a73f4799c9fabc12921d25a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d888g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d888g0v0Filler.json
new file mode 100644
index 000000000..4cc84bf24
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d888g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d888g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103786064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe20b1c25b773fcb3d3abe1fe4e68a0c68031f42c43486f738d05f9dba694e7ad",
+                        "s" : "0x2e8fbd03c9bc332762ccb63cf8b2444e3c38211c6edb226296b082cf1981bd0c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d889g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d889g0v0Filler.json
new file mode 100644
index 000000000..f449485db
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d889g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d889g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103796064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5164fdc490b36e1544294b435afc44eb43b44c83059b9341011b969084f19858",
+                        "s" : "0x62bf5035762c5389ed17c5472e88896dd989a5cba43fa8516c9cabfc32d4d4ef",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d88g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d88g0v0Filler.json
new file mode 100644
index 000000000..58d0cdbe4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d88g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d88g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60586064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x38f99b91f367821c3b9190e756ad7ea379118c652d7a9a29174f0f9636a6f883",
+                        "s" : "0x5b206c69cb5ade5b85c1c2187af9c69c0c5f5351d8c254061ff6383773e9329a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d890g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d890g0v0Filler.json
new file mode 100644
index 000000000..9c6f42fc5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d890g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d890g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61037a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x139fa63e2b1fb4454e2853ce56959395f66c0c87f38829b30a8cb893fd852de0",
+                        "s" : "0x0cf32dcabeb1fd08c10bfe97e691cbfd31b11b6d922df32072d4d92646a8de72",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d891g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d891g0v0Filler.json
new file mode 100644
index 000000000..d334b69b6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d891g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d891g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61037b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8cee6b6973bd8d9e79ae42752f83f83b64a7e5b112ffb481241d20df8700caf6",
+                        "s" : "0x0c7139c9db01a7411f8a513b89394a7723b438952967eead5d324213d9b65dbb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d892g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d892g0v0Filler.json
new file mode 100644
index 000000000..413bf5962
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d892g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d892g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61037c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0de59573f0d97dd0b3bc028c57942051df6b514c942c67a60d18caf8703e990f",
+                        "s" : "0x3b49ddbaa4c838585225fd38c01c0cfbb06d7efac84111d5aae9fdf57f22793a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d893g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d893g0v0Filler.json
new file mode 100644
index 000000000..5e23ebf4d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d893g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d893g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61037d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcbb137fac60b4da53f563bbb4c36cec1051c773b608ba3935d8bb352b61c6e38",
+                        "s" : "0x656cde78c841b87923297e08e2592ee546d3eb0ca2dc481e6770b1760e61a033",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d894g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d894g0v0Filler.json
new file mode 100644
index 000000000..3770d416e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d894g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d894g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61037e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc92f6ef61236141a162e8b7c8aa146446a5653732c57867ea87d7a9ff1a611a2",
+                        "s" : "0x1eecec02413c62dbf30baaa711e94121f8ae33a1f71618b79a2d4e8c7f305572",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d895g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d895g0v0Filler.json
new file mode 100644
index 000000000..f3ec586a8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d895g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d895g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61037f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcda70dd1eb1c0f918bbdd0dee63b7a0be72c163039c5baff1d71260e3fc63d2e",
+                        "s" : "0x2af60e0fc3c5c99f96904090e019eb59de592c736bde501a0aeb604c8c6dd2fb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d896g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d896g0v0Filler.json
new file mode 100644
index 000000000..217efd458
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d896g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d896g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103806064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x64a7a6b776d70bb721893788a723d12dcdb94dde5c4fac00eefaece063dff73c",
+                        "s" : "0x2de6e592fcdcdadaf6551a1d3de3173905b9b16c2b43e1c8bd834c40d6630cd7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d897g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d897g0v0Filler.json
new file mode 100644
index 000000000..dfc8455e2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d897g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d897g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103816064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7c3f5e593c9d1f2c140e1e8227ea37306dfe88529056c5aa0e90d353da993771",
+                        "s" : "0x6638fc43da453ef1d0ac473b536192e53b3a1c655adfea4544e9b22e48eab0d5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d898g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d898g0v0Filler.json
new file mode 100644
index 000000000..37b67075f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d898g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d898g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103826064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0f5d1d3dc470e38922a60ed9315ab74eb4dd12520fcd7967c4f2717a711b34d7",
+                        "s" : "0x58a196530aa7be2afb6b54cfab50c067820372906a933307401fb015934bfcbd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d899g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d899g0v0Filler.json
new file mode 100644
index 000000000..3ab17ac97
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d899g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d899g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103836064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x931ae5113adcefbb80a719c2a05d9b8750f57a89563eab498807a329ef19e251",
+                        "s" : "0x21ac07f3a3a6b1e2ba52b127232025236224eb9c201293a88750e08a3fa02918",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d89g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d89g0v0Filler.json
new file mode 100644
index 000000000..17d8b6733
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d89g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d89g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60596064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x44270a84d6781ffd01f6692b6019a96fad6b377b2916438988fe4a0c29ea0e0e",
+                        "s" : "0x6d5fa4c148d4e2959257f0727d11b4b0c4627e18cb9e097b155d7dba49cf7add",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d8g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d8g0v0Filler.json
new file mode 100644
index 000000000..7b1af7937
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d8g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d8g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60086064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4f0038f74b1995eff0fd338f881d525be926f4bb7343640eae6b77393395f13a",
+                        "s" : "0x11b65cae2ee19a41b3c7e64821f2b424ba26387523bd5251302109117269ac04",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d900g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d900g0v0Filler.json
new file mode 100644
index 000000000..2235e156f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d900g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d900g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103846064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa457cad65810209a8849fb2827593724823b6fb71985d49ee8bdc9cb8b636737",
+                        "s" : "0x08e3f6e55e28453b3496f595ff80dc3b57f0878bc95adcd8c4239acfc81f1000",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d901g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d901g0v0Filler.json
new file mode 100644
index 000000000..76d3d3897
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d901g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d901g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103856064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x20dce54a9c9cc78f42a7305a8109da5193a765c2ad55c3145bf43fdd868148ef",
+                        "s" : "0x49f438d6bb65a3decffe1202740983a30625c238e3b25a352e74c902c3a8a7c0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d902g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d902g0v0Filler.json
new file mode 100644
index 000000000..24f3d6c4d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d902g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d902g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103866064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf31dc6c4e52e0b3cd96fdea9093c5de0646a9b9b939073a6741d1fb8f25b82d5",
+                        "s" : "0x53ce82b9eea20c30245f5111bef9d486b907f844ae1da7a77c82f34def9188d5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d903g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d903g0v0Filler.json
new file mode 100644
index 000000000..9634ac970
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d903g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d903g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103876064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdbf52c851492ce14e43f1705fe4f47526f7bde1ac01de33f7ae6151d7c1b358b",
+                        "s" : "0x48348d5775f317ea33b4df35c80bd1e4d07744413aec17dc95e77c2795233e5d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d904g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d904g0v0Filler.json
new file mode 100644
index 000000000..11ee423ca
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d904g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d904g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103886064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xadd86f5986f973dc8aff952dca3112b93eb1ad50fcc6e23bf6c3bdd97968fc2e",
+                        "s" : "0x745ddaef83382187425226f0ea1b11acbc509567b85740412ab62611c57824cc",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d905g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d905g0v0Filler.json
new file mode 100644
index 000000000..8cf592bda
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d905g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d905g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103896064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd2fea350f94d357d7069971ab5985f059a8ec48ced055fca6081c92908b39c2e",
+                        "s" : "0x50b16b12620f2db361c32e3200948f96604ac1846a2910ab1bbae802fa44e505",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d906g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d906g0v0Filler.json
new file mode 100644
index 000000000..d4f5c1700
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d906g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d906g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61038a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa25bc2a9b97dc627ff1380b201b08c8eb5e6229378c4425aee4b2449c348d01e",
+                        "s" : "0x3246c3c82a3ce0f4fa838ac942e7a79771d937c9e9b7d5fc7da44ab5a3e3f871",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d907g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d907g0v0Filler.json
new file mode 100644
index 000000000..71f665399
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d907g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d907g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61038b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1ee387a126e16fdc98d89a4c4733b38aa081d6004c37a105a0d75618974653c0",
+                        "s" : "0x4138188b74e8286b452460ff7a65c365c699833874419d8adc404bd2113637d2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d908g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d908g0v0Filler.json
new file mode 100644
index 000000000..dd60e6f09
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d908g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d908g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61038c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x090d481107cdde195b711adcb4a60e6501d69ea98383cc19d7f3ee02ffb63705",
+                        "s" : "0x015abb52a49969426ccd45907f1f2f0c18e1d052f0ea17937cdec67c8ec5f1e7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d909g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d909g0v0Filler.json
new file mode 100644
index 000000000..d7e546592
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d909g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d909g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61038d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1dd0ccf30183627af6eacd7fe160dccf529d1252b9246c68d4becd445f5a25d0",
+                        "s" : "0x1cee583dd71df130d5b836d19eb2cada92b1a8bc02263f3e9edf9a7e3cc4e990",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d90g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d90g0v0Filler.json
new file mode 100644
index 000000000..f49517a61
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d90g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d90g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x605a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4196f40dff89828162aa99bd8e81740c66587ddd25218c190a4b02ad624b67a6",
+                        "s" : "0x3d7fca9bc882f6d5d7607d5a6ba85d7677acc772576cf17a3dee37bf54b58612",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d910g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d910g0v0Filler.json
new file mode 100644
index 000000000..f67ffccbb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d910g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d910g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61038e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x79b62582360937dd6fce29df9c3e0fda11d78a88d01fae1cdcedd251a1081f69",
+                        "s" : "0x374ea8fc4ef0daa7eaff446312313661121b4c21992bd2241c998fda5cb9ff81",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d911g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d911g0v0Filler.json
new file mode 100644
index 000000000..022fa1881
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d911g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d911g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61038f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5be20ef7f2f1d6b4b2d0125f3c741c9766c200d6042c167b5c0c3d6568943edf",
+                        "s" : "0x61f4e021ad7da1dcfa53ccd4c219369ae9143c44a75290c75390507fd955678c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d912g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d912g0v0Filler.json
new file mode 100644
index 000000000..3b5a649da
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d912g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d912g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103906064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbcffd0fecc2dec7315c051963f85bb27bd5f70f6b0b11b6a8c5931891fd1f481",
+                        "s" : "0x51536a4ea21beee0588caede231f6a34be6c7942ac31f3f6b80f44df21a24c3d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d913g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d913g0v0Filler.json
new file mode 100644
index 000000000..e197a1973
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d913g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d913g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103916064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x16b99fbbfb5d622908ddb138fd91dc2d25ef0eec064dc4f6b0a7c5107f97d436",
+                        "s" : "0x6cb750ae95ba944db72d861e0b276744c584da8b4f1cdbe4bf6d468f3a618e06",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d914g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d914g0v0Filler.json
new file mode 100644
index 000000000..70db36285
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d914g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d914g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103926064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9e7b244d0a653daa2c3fa655d16b2391915d84a16aa0cf3d5af91645f2e05ebe",
+                        "s" : "0x2796928f9240201f3eb63b54a6a0b78c3693f4da4e26e86cbc2a895aaf74313b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d915g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d915g0v0Filler.json
new file mode 100644
index 000000000..352b6da50
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d915g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d915g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103936064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3d7d20a28fb0493bc93dfcaaef00d0ea6fb17b380e4d8b41b0dfb334a9146c26",
+                        "s" : "0x04d731993687adb7d85f25f8ce46f4a7674645c45f5d743fa3378452f0e7e1dc",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d916g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d916g0v0Filler.json
new file mode 100644
index 000000000..c0e5d7140
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d916g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d916g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103946064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x12bdba4bd9b05806e1b1e455816e8d5e1d70e4e979d7407f4a302928d185ff70",
+                        "s" : "0x47717f00fa1ecdd7c30346b9ce617aa80d90e167678632c5c3a173e1fa8a0473",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d917g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d917g0v0Filler.json
new file mode 100644
index 000000000..c6fc52d61
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d917g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d917g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103956064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa72ce3ed004f8b27b9c42b2d5db578c7d669940125557645ca9a0d129a8c8121",
+                        "s" : "0x448c611383f1f0911b6083f59e63da1e749035d6dfeb15c6f3709e510b3e3465",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d918g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d918g0v0Filler.json
new file mode 100644
index 000000000..fc0af3d13
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d918g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d918g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103966064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa8efa807534c442c056b2f69de12abe529f2bbf24fd5ed8166e2439fe53e9874",
+                        "s" : "0x113d950f15b4dd7357f32da56bfb73061396a25a8630b241deea43b8351c6f2e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d919g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d919g0v0Filler.json
new file mode 100644
index 000000000..8d2234c2e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d919g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d919g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103976064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1854e3b28954688edd5e7658d1e868d3601089d38cdcce97a1e3f1af7c5b3e12",
+                        "s" : "0x755dbcd2d9e1a32fe53ee67fb3a20a14bf482caca20d3b982be91b3342baf3d5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d91g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d91g0v0Filler.json
new file mode 100644
index 000000000..58d0ebf92
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d91g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d91g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x605b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xef603acd7f1836f71e04c02975f52574438dcee740be31926ab9069d876c5d26",
+                        "s" : "0x738fce43c83c33a371f4503cfa7a7b363d7c5fa4ca7591167f19aee2d0f3a0e9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d920g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d920g0v0Filler.json
new file mode 100644
index 000000000..0bd2c55e2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d920g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d920g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103986064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc379e663e9a7d734d7c9010d2dec1041027811e419b7fb232d77a5bfe2754d88",
+                        "s" : "0x53781135bbd2ca2cc37268c0902d818e12a9399f15f3679262c688d2213c5748",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d921g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d921g0v0Filler.json
new file mode 100644
index 000000000..e8714b863
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d921g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d921g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103996064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4d0933e3b3a115022f49efaa8eb81d9dd4275c87046e96cd769838cb8f0f6a1d",
+                        "s" : "0x0967272a03a6075782117d62b08ba376e280c61d0cecdba19dc246df35101a4e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d922g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d922g0v0Filler.json
new file mode 100644
index 000000000..858e7fa9b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d922g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d922g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61039a6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb265b3ad93d1a9b82fc189b2b0986203e32b654ba040fc770afb57d2d084a83d",
+                        "s" : "0x7705ac055f6272e04d4fdf7059306b2926295995e5a13ed6fec5b093aa2c1596",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d923g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d923g0v0Filler.json
new file mode 100644
index 000000000..9b45b2f57
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d923g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d923g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61039b6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa154b4e6c22f2ee5f3f552c930c7d82ce148082429ed3c882782ff7914906e5c",
+                        "s" : "0x58576dcb2a2c300712e1388be8bac0d9f98fe6d0c575dfeb3965fca80dac9062",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d924g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d924g0v0Filler.json
new file mode 100644
index 000000000..1ff4ad82b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d924g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d924g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61039c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9cac3bf657e60b2792fd9f087268137ff61353c21452ff140ba5782f064cf0a9",
+                        "s" : "0x1416136c900af7a7526085047d7fa9355aaa61bca7b8819b4717a70614adc7aa",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d925g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d925g0v0Filler.json
new file mode 100644
index 000000000..8b8cccb88
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d925g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d925g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61039d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2cfae9d698aa733dfb4011ce76956b7f46a611c76292c1cf592ee7255d808618",
+                        "s" : "0x252023432365a7526f5e85a943d36b20cbb0619eef4c91337f1e281dd6bed721",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d926g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d926g0v0Filler.json
new file mode 100644
index 000000000..379a54d66
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d926g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d926g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61039e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2bbce3881cd995ab00da9137b1dabefc6cbcfb3a042a5855bc2834522771f7d8",
+                        "s" : "0x58b110837637d02da3a9844bf77ff1a261613c52aa52da9c6c9847c4f51ca5f8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d927g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d927g0v0Filler.json
new file mode 100644
index 000000000..630ab8f54
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d927g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d927g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61039f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x505959850cf5094ddaa0cc94741d2ab07a075e0d38bbf77e0293f47e44dffbca",
+                        "s" : "0x203a2c253c609f0cabea499dcf994cce98cc93527492edd4483e70988c42a761",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d928g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d928g0v0Filler.json
new file mode 100644
index 000000000..7e2b164b7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d928g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d928g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103a06064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb4e13380f25fe223b6110b667712cda5d942aeb920f042fcc92f240dcaba5af4",
+                        "s" : "0x220bfa061432c0ae09453f4eadfedec3a3d3e752ea487d0bec94830c6634bc92",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d929g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d929g0v0Filler.json
new file mode 100644
index 000000000..a65f11eb9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d929g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d929g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103a16064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc9e0f43f41d1702d8da1bcfb9a9a6a245be58dcdea119e7c6f4ed7a8b05d5daa",
+                        "s" : "0x0f4a9a60bf043907220de6dc3ca55877d8d490bda2a5cead57c87d5764816a05",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d92g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d92g0v0Filler.json
new file mode 100644
index 000000000..b33f701a0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d92g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d92g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x605c6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xebc35b4758c5ca9c64414834ffed7c4b0b15d37e9e8d8b6e4823814c331b699e",
+                        "s" : "0x7bf9ca0e87de2add821a4405746e9e29eb738173c5e3423f320f5f9c324a3e1f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d930g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d930g0v0Filler.json
new file mode 100644
index 000000000..c8113c857
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d930g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d930g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103a26064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x31a0f54ab0f60802a82da6b724a7969f7987cbd57d62bb0b94e7a89a0d2d1c44",
+                        "s" : "0x5e068e36a5e132963d3d3712e27ba47067f27e73e01cf1e35bd080b3569b3188",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d931g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d931g0v0Filler.json
new file mode 100644
index 000000000..0bcea5188
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d931g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d931g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103a36064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf1dd9f27783bcc61ea70dffc2c739837925210dc68eeb4358b64cee9d5ff18c2",
+                        "s" : "0x2bc51477a0f13187f72c80af40ef186773ecc3dc1a5981596b0c66dd90c8abb6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d932g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d932g0v0Filler.json
new file mode 100644
index 000000000..a636d41bd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d932g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d932g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103a46064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd3037df7394f00e8d72a69ab0b18d9c8250c7bfa99f8a88b77087c3e272a2a3c",
+                        "s" : "0x24f18383277c934d0defa8589680bcc7d1e7e7435c0af724a901d1ac7ccd2aff",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d933g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d933g0v0Filler.json
new file mode 100644
index 000000000..7b9bc75a3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d933g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d933g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103a56064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7962b0d9372fdbef5b6b56fcdb667fa21e61bdfa0d83079dcf0a9319b79e6a86",
+                        "s" : "0x9876ab8596f331f23c84109832dc1dec639de0d8169fbf8871b0003f6c24ce",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d934g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d934g0v0Filler.json
new file mode 100644
index 000000000..80ae8d1a6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d934g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d934g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103a66064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x291bf487bdebabdc2edbb96cc6c538fc9951d6f76c012e73b4dc1b5465a1ffaf",
+                        "s" : "0x416e9db526076f71333146a234d984b72276facf81943f06434d4bc2b5873c3c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d935g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d935g0v0Filler.json
new file mode 100644
index 000000000..f6f53f62a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d935g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d935g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103a76064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0539891cd7887f274b907735115c8a439fa1b5efd63c897b53e556a802f1e420",
+                        "s" : "0x335133b9f53d3a4ab2d47a16044defdca28a565a170f54debbcdf84d94076fd1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d936g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d936g0v0Filler.json
new file mode 100644
index 000000000..33490c730
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d936g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d936g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103a86064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf57fcab273e1a47ebafaf4feeadac0ee94ebbe9df9362e94d175155f8e3154fc",
+                        "s" : "0x6bbfb720e2b0ab9fe111a60284494739c78855c27915dfc26d707cf0b390d12f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d937g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d937g0v0Filler.json
new file mode 100644
index 000000000..c7f25e3da
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d937g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d937g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103a96064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0892262191b2147a79c661721c147e0a1c6ab82da808493377c12e2f0ed6e405",
+                        "s" : "0x7087d18857fce00f3b3cad9468f26f3fbd79e1be49eff79aafeef99494ea3945",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d938g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d938g0v0Filler.json
new file mode 100644
index 000000000..212018de2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d938g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d938g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103aa6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd39d86a6adae3c066ddaf4303c3e16163162f4f93f1d24e26d4e54d2198f09dd",
+                        "s" : "0x14d343e785a6d13d0b4b211715a4507a213e2595cf4b0a34f57df93f3f43931b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d939g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d939g0v0Filler.json
new file mode 100644
index 000000000..176f0ba44
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d939g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d939g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ab6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4972b03b43ff972f09956ecf9fc2752e5a689831113e93b1cdbc678163f3f420",
+                        "s" : "0x39fdb7eed8bb542090fdd9eb505fba55ec63987881ec35e2f1560aec671d36f2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d93g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d93g0v0Filler.json
new file mode 100644
index 000000000..188ec99d9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d93g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d93g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x605d6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfe703584f6fd8531533c543b5a812f34f281da2f5f1b07721377f494480f59b5",
+                        "s" : "0x553f8764924a1efafff75de4669d1ed8346f452b564cde7ff8b2b58776148b48",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d940g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d940g0v0Filler.json
new file mode 100644
index 000000000..e53bee647
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d940g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d940g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ac6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfd42e9425385648bed89acea39c4ae9fd540d3ec1e4b4e56bf9f7777482bf706",
+                        "s" : "0x7ec12419d123be75be466aab09d9714a2161ab666ee1ab4100eb67e62dfb02e9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d941g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d941g0v0Filler.json
new file mode 100644
index 000000000..67ca8c2fb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d941g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d941g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ad6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x854d0c33862ecc03e4ff667c5743efe39d63cb758210ee42d3ff6daf83440384",
+                        "s" : "0x646370deeca2b7c6a7fe67f525e7011b4152649bf03deff4c14cc0b3fc31e076",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d942g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d942g0v0Filler.json
new file mode 100644
index 000000000..c556527b1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d942g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d942g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ae6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x13a20f0d98f94d7ccf8a05897592cca1cfd8c20d20a8b045828bc0fadb913981",
+                        "s" : "0x5f6aa9ea3dd991381d6fcf95ccdd025b6782e78598b404c192489991a61c2a09",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d943g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d943g0v0Filler.json
new file mode 100644
index 000000000..3a1f75199
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d943g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d943g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103af6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe0524c53238c810967d504159ffad02b877732a473c16467de65d015a7ae8bd7",
+                        "s" : "0x1fc31b6dd5f44792e6738de430cfeab4faf44eba6f30b520c2d67c9f2f3f8e7d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d944g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d944g0v0Filler.json
new file mode 100644
index 000000000..b24974866
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d944g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d944g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103b06064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb5c49e0e6b92368ba169428dd5ebaa18823eeb79462bcfb1571ad89260060b81",
+                        "s" : "0x7be57fe82b2327b43c702305b0b0c2293e23648c0f27f15bdb9363ebbffa875e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d945g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d945g0v0Filler.json
new file mode 100644
index 000000000..2d00362a7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d945g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d945g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103b16064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf359d00f3b43aa4a0652ae4238504e5affaa5fb55f1ca4214da6302d807791b0",
+                        "s" : "0x213ad3841a45b8b86bfa5fe27050bbe52b341fe82beb6274456853a96fccd51c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d946g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d946g0v0Filler.json
new file mode 100644
index 000000000..3e7f6f3ae
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d946g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d946g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103b26064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9ca37aa4ac2fda4ba5e087416ca758723d539d62a69db96da798b760414f91cc",
+                        "s" : "0x0b4361ae0252d909e91e94390fef4752528180602593f9f9c611e84d1df35839",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d947g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d947g0v0Filler.json
new file mode 100644
index 000000000..40fe9319c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d947g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d947g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103b36064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x11600389232ee1da614f61ffe0479532a24d01ee3660fb648921fc204af935e1",
+                        "s" : "0x4c1f6d20f39593838a9a0042abf10e761932ca3c193e89e323ff52e6fcf1703c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d948g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d948g0v0Filler.json
new file mode 100644
index 000000000..1e842a79c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d948g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d948g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103b46064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcaa678cf04ddace7e7739f58b28fd26e16f0b7e112bf342d5cd3e75bd8c178da",
+                        "s" : "0x14008c6bbc6143c54144c7f08da7a2032b9a9fc4c0b46acf0951f203c6b5a6fc",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d949g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d949g0v0Filler.json
new file mode 100644
index 000000000..255bac7e1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d949g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d949g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103b56064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x029d5fd419c7b037702ade3585f3bfe380ec3b51826a76db326cebcd5a0261ce",
+                        "s" : "0x127f57cbd8d402b64f3ebe2c664a4e55dcf947a6bb7790e0ad427fef479bec12",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d94g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d94g0v0Filler.json
new file mode 100644
index 000000000..4969935ad
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d94g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d94g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x605e6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5299b4326d3984dd256705ccf3fc98e3404678b253696ea2d99789fb515eb4a6",
+                        "s" : "0x43517a138177720a668c1b514598a986d2e928d51f4c81bb473c19e4a656c719",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d950g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d950g0v0Filler.json
new file mode 100644
index 000000000..3e0fe2818
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d950g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d950g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103b66064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xee38bfb0c2706ab410c2bbe2275b9b4103b2b5dd6d88eaa27e09cdefedd2771f",
+                        "s" : "0x62772269cefebd4f94ab0d07cbd59383c55cbf76193566f81532bfa03f8e1e22",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d951g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d951g0v0Filler.json
new file mode 100644
index 000000000..1133ee60a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d951g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d951g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103b76064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xef7bdf40ab215eec53af5371949b8f155451e43736abb306bf24f07fcb5629db",
+                        "s" : "0x13e60dad396ad83ca0d13ce64a31e6ef2aae1b2e78e506da875d3564753363bb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d952g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d952g0v0Filler.json
new file mode 100644
index 000000000..40c5ef220
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d952g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d952g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103b86064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x05836f4e7bb55adbd2e9ec5def1c657047cac77eeb24bf8147090aa374fc3e6b",
+                        "s" : "0x723e77404f3592971f65679c9e3a20e33a69684d135207041371c21bd48bd828",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d953g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d953g0v0Filler.json
new file mode 100644
index 000000000..20a5f1d32
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d953g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d953g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103b96064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe261135303bfd45f026511952938475a81983d6d1b648d21a5abf377f49df11a",
+                        "s" : "0x792ad1f46f0f2a5d8f2b309db3ce1b17911dbefa05c5ce48b35323d27e53c66a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d954g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d954g0v0Filler.json
new file mode 100644
index 000000000..c0c6e6a88
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d954g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d954g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ba6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf6df63cd883c9e5176edeb6726134bfedb0276a076dbe6faa2ab5d47500e072c",
+                        "s" : "0x0a92c920eaa7b75f5cc3449bfd6c8bde61f4c4d55bc9d66d45c70f97a5f76128",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d955g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d955g0v0Filler.json
new file mode 100644
index 000000000..cf81a95ec
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d955g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d955g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103bb6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6ae1bf079d4a7566f29d7b99c87f699e20e5f0afad0d67ac84df30ca814c9d57",
+                        "s" : "0xc2a616127872630b027a1760527785e543b6fc58797d78f4c3d58f042d565e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d956g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d956g0v0Filler.json
new file mode 100644
index 000000000..b7b1ffffe
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d956g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d956g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103bc6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbda1e36358c69eab88a7e1775b7f67954dafa84fedc5259e392a5eeec6325980",
+                        "s" : "0x3f5631080a119c66df9c568bc16fcc953a50ba6a61162a392aaeadadd3a1cbc6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d957g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d957g0v0Filler.json
new file mode 100644
index 000000000..a7702620c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d957g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d957g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103bd6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd51663fd849e703b9e6d7d2742b45d5aec9f81ce23c4932aa97f121bd8ef0b1f",
+                        "s" : "0x2525a20d7f695bd32cce2f0ce078a72aeac9ad6d5c0b4c87d5aa930ff7abe772",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d958g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d958g0v0Filler.json
new file mode 100644
index 000000000..14523693e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d958g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d958g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103be6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x89443abe576f354684da2ffbfd28a3f9b3e4513aa6a4fb0f075710a45c3a65ff",
+                        "s" : "0x4fa7c035d3c99b8b77e3eff4c0b57c25b15737f3c110db703d8171d1c742bf2b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d959g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d959g0v0Filler.json
new file mode 100644
index 000000000..da9e7d78c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d959g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d959g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103bf6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe52bc3dc6fec32bb7070a83c08ee56985c98d92f3884dccc640db94bff9343c4",
+                        "s" : "0x0d0dcdafa9baeea2ebbf7d13780fa58f78c8fc1400667e26507f472edfe14b1a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d95g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d95g0v0Filler.json
new file mode 100644
index 000000000..b2195ae61
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d95g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d95g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x605f6064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdd10cfdb006f509fc8652b9e2402509cdf6311440290dd4915e0b4f3e114ac94",
+                        "s" : "0x3195294dee99555097f75a437084c63768ad7be2ce6d5e8a44a0f1226623343e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d960g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d960g0v0Filler.json
new file mode 100644
index 000000000..c2ade1e9f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d960g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d960g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103c06064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x27c6f157d0914b676645cceda9310d8f63aa82fbdbfa2a0dfef2682022b0d962",
+                        "s" : "0x6b704801c745648bf0b863fc43899d75686769c0f0603c18856e0febd2f6615e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d961g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d961g0v0Filler.json
new file mode 100644
index 000000000..014fde6f5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d961g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d961g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103c16064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb01f4e9e4d1d21c3a3bdad326cf9fc4a4a2d436b443f38a8e583e207d2dca171",
+                        "s" : "0x5aba2a93cd80b9379e6709fe744da9b3cf57d432d03c294b364821111c04b078",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d962g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d962g0v0Filler.json
new file mode 100644
index 000000000..ea16df501
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d962g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d962g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103c26064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa5fe0ab60ad60197655953690bfbc724f4b40f2dea6576eed3dd9a7a112b8489",
+                        "s" : "0x1e3667caa27a98b02c3c8575a41af907a3f8b87f67159b722d4b47515e799318",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d963g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d963g0v0Filler.json
new file mode 100644
index 000000000..5af70b400
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d963g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d963g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103c36064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xece8e9b2592f38616d13c1bc91650aeb040691b3023693885b905c1637a55453",
+                        "s" : "0x17d73d3cff6e121cb94baba7bf0744f2355a78c0dd32199fedbe3484a17e2374",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d964g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d964g0v0Filler.json
new file mode 100644
index 000000000..73689d389
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d964g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d964g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103c46064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe5d2a29bcdb0288ee5461a7b213859d427734e86d83e1688468dde7f5cb5ac35",
+                        "s" : "0x6e3293510e075a42dc3c612135db83e3724c42a2ba41d9d920036be8a98c9989",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d965g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d965g0v0Filler.json
new file mode 100644
index 000000000..2ec3a7645
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d965g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d965g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103c56064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3b4f39c17b19259b15f43a1a225b4298f47715bd0c10c4e7f3264381895ea4da",
+                        "s" : "0x6e37fbc2d7bf7260d13ad11fa3d31a0ba3ea237441781b141aeffc6a694508e8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d966g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d966g0v0Filler.json
new file mode 100644
index 000000000..af5f66d61
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d966g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d966g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103c66064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x843c3398237c4fdd2202e38559214a55445e8423c4029645c94ad2665f5be723",
+                        "s" : "0x4382e6b4e8ba34b7c35721f1994810a7a195ee23f3fa22050e216310afc988ac",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d967g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d967g0v0Filler.json
new file mode 100644
index 000000000..34ce6ddd1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d967g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d967g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103c76064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcdec3d9b977a99b432209e4afc6a911a02ce0cbe51fbcd5add7d5a11b0c30ca5",
+                        "s" : "0x4b7288ceb70d4d6b1ab97055ac879644d0de454a6450ff5ae7c37ed3671ad86b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d968g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d968g0v0Filler.json
new file mode 100644
index 000000000..f56a50236
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d968g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d968g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103c86064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x76486dc4ece86e5607a7050cf75d82f55e9c9dec2ced33275970a23b653ae4a3",
+                        "s" : "0x374d95c0b8d88cee41f98aaa1b9927dfe980c4b8a1f6a44822aced6fa76fcb4a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d969g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d969g0v0Filler.json
new file mode 100644
index 000000000..7eada05b3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d969g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d969g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103c96064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9f936b04a602b393d2a9b97caf9cca04eccbc30323947b3d0e300ceff43acb27",
+                        "s" : "0x703306082ba250a8f7e0de485657efd33b9076b80ed7449b4256f06b4fb8a6f6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d96g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d96g0v0Filler.json
new file mode 100644
index 000000000..162990db6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d96g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d96g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60606064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbf8f09e23c9ab452f50e1918160a9f1938ced03d56eebc4d401178b0a6d7fbd8",
+                        "s" : "0x4e639c73bf431d7360803df9ee644b82a38d99db0f3368e0d8952836fea9b0be",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d970g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d970g0v0Filler.json
new file mode 100644
index 000000000..aa182a416
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d970g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d970g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ca6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8ad17b9010c9f7e1ff44a5b5d84302e10db644627ccc37dc29f786b4f4d655c6",
+                        "s" : "0x26d025034655c3c01e8c7976e87ebee7b2df75f1a7906869986a6d734b03410b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d971g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d971g0v0Filler.json
new file mode 100644
index 000000000..d856e6196
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d971g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d971g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103cb6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x291ce2cb9cd68ac384228b6f1ccc2c8eabbd553d5a8bacb8a16d258023b63f71",
+                        "s" : "0x0dcc3d69ee10e0de7665b0002d591773a5084b7a2c9d68ededb46853cc01c16c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d972g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d972g0v0Filler.json
new file mode 100644
index 000000000..008ae11ca
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d972g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d972g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103cc6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaf49996a22fa9fbcb83b86897c2315bb6eb92f8551693befbcdda61b57b3ebbd",
+                        "s" : "0x4cecebc1cdb93c43e95c16839a1e6b0b1934770223ec1894a45869330c8ac6d5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d973g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d973g0v0Filler.json
new file mode 100644
index 000000000..14eed78c1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d973g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d973g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103cd6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd92521887d784d6fdd0cc9fdc7c471f39e13f5a50f63ba219abb05058592b6b2",
+                        "s" : "0x1b7ac0e4ece73ef9814c7ac9be3071daca7406bc61210b65afb319582924cf56",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d974g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d974g0v0Filler.json
new file mode 100644
index 000000000..7e056306c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d974g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d974g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ce6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1117658d1d531fa35138d29b21c1235a6b652fc38243fb43dd463bfab749e87f",
+                        "s" : "0x21501606cb72863f712b9d3340bf612fabe256f3764a97b62898a0134d3571ca",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d975g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d975g0v0Filler.json
new file mode 100644
index 000000000..f2ac75b5f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d975g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d975g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103cf6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xecb01510884bd3b1ac899789d76f473578ce63b0ca5c97d208a5c15feb03a0b0",
+                        "s" : "0x2122ed03f9559238b756d1e6fc5a984a1cb72b48923c5fbaa8ccb718b0fd02ee",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d976g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d976g0v0Filler.json
new file mode 100644
index 000000000..fa3044bc2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d976g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d976g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103d06064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa96a1b17af064fd40f964ad50f1c9de39e5cd58660bf853b647e8f29a23b99eb",
+                        "s" : "0x435f503fb5e2967406998f1773534a8ced5e0e0a5a22b8c8fd3b2bf7b41d7004",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d977g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d977g0v0Filler.json
new file mode 100644
index 000000000..4164542b4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d977g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d977g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103d16064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc520b5e533240f9163b240db7c881c053530bb8c285a0080a70029110b9b88e",
+                        "s" : "0x6a00ebcb8c32c7ab6f6b691f880864c31f9b40c308b240c1882c0f04ef1f2b4c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d978g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d978g0v0Filler.json
new file mode 100644
index 000000000..1781c43f6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d978g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d978g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103d26064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd28f4bd0f34845f540294afb3d1ee69fbd0c52f8142782845bb3cb49531a8335",
+                        "s" : "0x47e3feae322ede8975db2f0dae72e57cef5d92dde07b0be1e3155ca22487d34f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d979g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d979g0v0Filler.json
new file mode 100644
index 000000000..9fd89739f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d979g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d979g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103d36064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd9aa2ef83dcc01d223899b1f042d44cbb0f8b6c1ecfcc38283d56215ea73b85d",
+                        "s" : "0x7c98732b56809d3e992627d6481735ef943398697d8fff99a87182818cacdcde",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d97g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d97g0v0Filler.json
new file mode 100644
index 000000000..bdbacd079
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d97g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d97g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60616064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x59fb6ed008e224637dcd0bbd9da346045de6ad83f8de7776cab75c0c7b6261ba",
+                        "s" : "0x50f330e3be42909427da2ba68a033da689c5ca8b8cc01f8e9af1c9c0e4e56f4b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d980g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d980g0v0Filler.json
new file mode 100644
index 000000000..0b816ba9d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d980g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d980g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103d46064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6073b3b6031bde501ce5654425c61841db8256f3dbb90893e830753843da0940",
+                        "s" : "0x60034ae3815224480c489696f829023590046bed21c06019ac5e8f72fa4d9e31",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d981g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d981g0v0Filler.json
new file mode 100644
index 000000000..6022641e5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d981g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d981g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103d56064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x03b55d4bc82d93ddd3654abb2cb002d581bf40bf1e6725ea3a7f45d7f80116ad",
+                        "s" : "0x48f1c558117fa0b4be8aa5eea1b1a9fea6a34093bd20f5d981cbc40b47092386",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d982g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d982g0v0Filler.json
new file mode 100644
index 000000000..16c1172bb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d982g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d982g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103d66064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x891babc9369406044211892d6830d6892b8f1e90ebafcd12a1b3cd3c3b760d71",
+                        "s" : "0x6e72190ccca5b22c33f9758b7dbbe504111716bb33c13c46c500be0c9b948d5d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d983g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d983g0v0Filler.json
new file mode 100644
index 000000000..361a1cd1a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d983g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d983g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103d76064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xebbf0d91aca70f17f50d334493499cc35839b459fd4c4dff637c6378be36cdc6",
+                        "s" : "0x60dbac246ec612cb19f383981bfaf33313bf6714c18528e5633d2dfbc2f231af",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d984g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d984g0v0Filler.json
new file mode 100644
index 000000000..0b4b22283
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d984g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d984g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103d86064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x926eb0637f381b0e99b9b016e2289a3d0c35aa4192b007d3427c7941a670ac75",
+                        "s" : "0x324c328b44b44fc383fcd137a405eb8660d0360e0b82eefe5c0004915cc28202",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d985g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d985g0v0Filler.json
new file mode 100644
index 000000000..f87764be7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d985g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d985g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103d96064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfde798640b5125e8984cee61f3321d978a716bb16244ca23b26bd63242825452",
+                        "s" : "0x3b2860e0cb84c0bdfc3ea30f6213dd36e1bbe2c6ef5db31876ec7ffa39d698bd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d986g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d986g0v0Filler.json
new file mode 100644
index 000000000..819cf578b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d986g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d986g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103da6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4bd705d94a6fddfe2888e9c75d8a5e2ccfb97e97801b2c07c00c1feb68840ae9",
+                        "s" : "0x5f3adac3338240b2fad5061ea656a95377625f1a9c1a5e45f5e05110ee309751",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d987g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d987g0v0Filler.json
new file mode 100644
index 000000000..02a278051
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d987g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d987g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103db6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x175103050caa4139315ebe1bb6af1e14a23eb227cf517aa63def58f315ea9c12",
+                        "s" : "0x5a80609e9741f4f109562ebabf6a1c3b11cd821975d709a633710933f4c87232",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d988g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d988g0v0Filler.json
new file mode 100644
index 000000000..da7e92341
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d988g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d988g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103dc6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1f222a002c33b20b4136fc30dbf82ecb48374e679f09046d369e1a45004a204b",
+                        "s" : "0x4574714319737251bb23cee0293ec5e3b0582a5bfaa16001d4c5edd1d9ee4cc6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d989g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d989g0v0Filler.json
new file mode 100644
index 000000000..d7c97c97e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d989g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d989g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103dd6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x95a3a851019acab394adb088a635fa75c5201bb5e4fafaab813bf2f483927d53",
+                        "s" : "0x1cf74516fd21f1008c9e47e0714df59884682f98166f8a6b858e0b0b661aa3d1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d98g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d98g0v0Filler.json
new file mode 100644
index 000000000..9e9b5833f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d98g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d98g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60626064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfd9b3ea4351731c8db74f614f09313f6a4fe344801c3f78569262eb2b3f7f94f",
+                        "s" : "0x1202f4d5326a5a9885973c55df2b7dc96407d8d47e5d10456238c25492b226eb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d990g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d990g0v0Filler.json
new file mode 100644
index 000000000..d2eecf947
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d990g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d990g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103de6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x22a3a7bc38a895d22cf49c95f18b2d58771ac63d10af2132820794193ebd9662",
+                        "s" : "0x2daa87253a9c1b65a935ff19c84583bae6a98fa9f142a6e9b32af88f49cac177",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d991g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d991g0v0Filler.json
new file mode 100644
index 000000000..8f5cdfa74
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d991g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d991g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103df6064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x990a60b732e770365d5f457bc270b29b27712a2960e0f7d84f8aaa48e566751c",
+                        "s" : "0x7dbf825081d80c69b3f394a351629c63686d64a346c937799bdf719a191e93fe",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d992g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d992g0v0Filler.json
new file mode 100644
index 000000000..fd2bcd355
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d992g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d992g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103e06064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7c9708398c5a17902ef7687784a161e02a82ddc633abf5b03c171089689e76b9",
+                        "s" : "0x72d9448b2d07140761f87a9070786f1f2ec5bb503714d4c4a2cfb5d40b4ce82b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d993g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d993g0v0Filler.json
new file mode 100644
index 000000000..dffad71f7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d993g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d993g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103e16064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x292166c28f943f97152e9d3ec3e9a5dc698dc79fe6ed32517b37d606c4df8b",
+                        "s" : "0x1b25372c9578a4bc1da0f3dc468cd70cd78f8b752aa0b9cfff7fa4ded1a9a5a2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d994g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d994g0v0Filler.json
new file mode 100644
index 000000000..1b828ef8d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d994g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d994g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103e26064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdcd2d4d03168963281804ca36220145eb3b85b2728413ed827de8e8ad326fc9e",
+                        "s" : "0x7dd9b4efeb34c504fffa5952a96857660528f719acad6cff09651d4b801bdd0a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d995g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d995g0v0Filler.json
new file mode 100644
index 000000000..3a5e67cfc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d995g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d995g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103e36064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf7eb5a2e78aadd5e3f38237f3577a69e1a5edf3fa146a349fb1ff18464e7f72f",
+                        "s" : "0x4c3a1d26faec3fe3a8b196a42d4e39796ad3f01c872b1e14f2cfeb5970d55fb6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d996g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d996g0v0Filler.json
new file mode 100644
index 000000000..c1d92cf36
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d996g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d996g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103e46064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x832aaee7d171729011ac181baa9e03824b49a66e661ab4842a264e7df59857a7",
+                        "s" : "0x76186fd862f08d99272413f3c9add54936523b3e0dc32c2224c2dc2cdf177035",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d997g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d997g0v0Filler.json
new file mode 100644
index 000000000..015fc3506
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d997g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d997g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103e56064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd98b899d9cbf8647091039f275063fc736890bf17bd761bd6d5847139d7533e5",
+                        "s" : "0x40775811fae405dd68efbfdfdffc6568145fb9c59edf721d6ce86f7dfac6aaf6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d998g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d998g0v0Filler.json
new file mode 100644
index 000000000..b63b1b980
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d998g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d998g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103e66064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x522c13ea3969d93addf0f6979031e832f5134a3be55e989f85eda3cc0a7c3be7",
+                        "s" : "0x5467b914feae2a102546eb1d11f046997db92fcc1aa9076d7d01e017dbacf24f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d999g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d999g0v0Filler.json
new file mode 100644
index 000000000..92f113bf5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d999g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d999g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103e76064526000600060206000600073b100000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b100000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6d86885b9fadaed916529192f47adb27900b9404763a33ff34c3e843eaef1088",
+                        "s" : "0x316d92f72bc0a2095ad07bee991bd87e2c20ea9a5c63858d84b684204c0139a9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d99g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d99g0v0Filler.json
new file mode 100644
index 000000000..3f96bcca9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d99g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d99g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60636064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x16d4f8a284c6ec8647aa3623fd82253bab8f10975011da3b28e6e91628156647",
+                        "s" : "0x6bb530fc754f51b70c9f767034abadfd97340614489acf5c0e2c50d20cbc7212",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d9g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d9g0v0Filler.json
new file mode 100644
index 000000000..ca553d5ad
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial1_d9g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial1_d9g0v0" : {
+        "_info" : {
+            "comment" : "sstore 1 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60096064526000600060206000600073b100000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b100000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9d8391307d8084592228c5a8b8680ede7a3aab6ff7890110a7c08409ccbdd4a8",
+                        "s" : "0x4bda57763ccaf279b51e9636dfb1d7b62ec35af5be4a54320a0a64f7b9bf1da3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d0g0v0Filler.json
new file mode 100644
index 000000000..10941a586
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d0g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d0g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6000606452600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x29c59d57086940fd12c0ff2b0fa7e7aa3b4a134cc535a93939145ecf89a474d0",
+                        "s" : "0x445a43d8a7b4ec60cc222f2e7dd5a33bad15289037e1db80e582ec5edf7b8167",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1000g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1000g0v0Filler.json
new file mode 100644
index 000000000..71a8575a8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1000g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1000g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103e86064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6d8c0332264abc6ed8bfb1fc8825a22b475394346e8f3a1a9262081db9f1854e",
+                        "s" : "0x75673314eb5226c71915153929c0e135121a95b3d85429914927a5eb4a80d1d2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1001g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1001g0v0Filler.json
new file mode 100644
index 000000000..36e775331
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1001g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1001g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103e96064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d908d47a0a506b76fbc9a16c217fff35d3912e5267950d253f17cd51011a82e",
+                        "s" : "0x31ccf456bd79d7ee35876551e78c1ea631b593bd0cefcea5da3fc14241b250de",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1002g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1002g0v0Filler.json
new file mode 100644
index 000000000..60970e57f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1002g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1002g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ea6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7f1ef68b31cb6d54cdf77b03ff75e5400db8ff604c8c9eab2a77bbc05450774d",
+                        "s" : "0x45d5694c18dcc2a98fb4726e838e5e32b1fae27af7eae1f335ba072117a48289",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1003g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1003g0v0Filler.json
new file mode 100644
index 000000000..63ddcb48a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1003g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1003g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103eb6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf21638564d38133aa4a624f95abcd586c2571338ac1033fc18dd9f39b767b22c",
+                        "s" : "0x36e4d130843de6c8cd0ee83ac366b53ae9e038fb76aae56af3fffe2f84a426ce",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1004g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1004g0v0Filler.json
new file mode 100644
index 000000000..47a29a30e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1004g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1004g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ec6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa397b23401f3e741aa16af2d3089bad9ed1a96859b0602d409e9dd4d9183f1f0",
+                        "s" : "0x37b5b6d6cf719958b755aff70ae657b29e6fc933b3b4d505795ec8633df0101a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1005g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1005g0v0Filler.json
new file mode 100644
index 000000000..43dc7a698
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1005g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1005g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ed6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x111c9552388f83469a6006baa74db474e745d230db5dc6bc70e763f9ae56e411",
+                        "s" : "0x27096ef86718e093796f2beb1d4c133d349961e4fa36669bfba2240f8fa92a64",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1006g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1006g0v0Filler.json
new file mode 100644
index 000000000..2ce413dce
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1006g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1006g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ee6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfcc697b32fee118a8593e3ee7b9ccd9f9a27ed4e1d8a7339351899c387886fba",
+                        "s" : "0x6738a0b4e6f6814592d814c6f683887f8b53e29a1513aff595dc1d71762dfa22",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1007g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1007g0v0Filler.json
new file mode 100644
index 000000000..181b6ad59
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1007g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1007g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ef6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xafa1d7c526f32492d46a64080bcddbf209740492bde409474473cfe2852e3b37",
+                        "s" : "0x63469f91b435df0cd869e9db405a311cd820c78aed7341340bed6813ffc210aa",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1008g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1008g0v0Filler.json
new file mode 100644
index 000000000..83e568d6f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1008g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1008g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103f06064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4ad63c40ea4c8ff39fa2829f9c37deeb9c0c6a46c3da495c0cb7e4cdf05770ad",
+                        "s" : "0x6d90794f7ea6a4ee43d917f69fb5ca8f12822eaacbb96a1f3b89b380d6d4abd5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1009g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1009g0v0Filler.json
new file mode 100644
index 000000000..c97ad42e0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1009g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1009g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103f16064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3d00f8a0ff29dad98ab43440af03adf170ca46577f997bae26e7f6d0edb52951",
+                        "s" : "0x45e8809ed05ffeef93a0874436e0259e608cfe99d61bc14a57ecdf1467d735f2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d100g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d100g0v0Filler.json
new file mode 100644
index 000000000..ea9509b27
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d100g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d100g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60646064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x92d43e3d1824a46367acdebdc167b3f3df734d0a016ff85c9a8b2f4dd4d0dfea",
+                        "s" : "0x607740c8a989ce5dc939bcf388cae7219aa0db071a4be2854a76a1d07e89f9fc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1010g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1010g0v0Filler.json
new file mode 100644
index 000000000..f20995dc1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1010g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1010g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103f26064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xecfa3c90d9319a834be27d9b5b979d73d8eaf9089c234d973a3315e86d51490d",
+                        "s" : "0x3e2dda9f6f8473a9f1465f409167af2d4efa9ac0b8459f1577bc9e1b359c99fb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1011g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1011g0v0Filler.json
new file mode 100644
index 000000000..64c242d9d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1011g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1011g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103f36064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9bd8a4e9bff23c7dafddf45df5673f275e0dadbf03a89eabceee922549422195",
+                        "s" : "0x16fc19c5b869b7c18bddb93df88e9e555093be29fcb39792ffb6e31408501cb0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1012g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1012g0v0Filler.json
new file mode 100644
index 000000000..fe48823b5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1012g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1012g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103f46064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7ee5cc485617d89520aad1527e1eca99ed4a135f9a743b5ef5811f46570fb18c",
+                        "s" : "0x7b963801596cca8c96800bdbd623e611151f4a2738c801896d2f1aca8814b5cc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1013g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1013g0v0Filler.json
new file mode 100644
index 000000000..180d14613
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1013g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1013g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103f56064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd0524a46a80447565a6add9a971e11ebf3dd2e0318987970a09389d514472d8b",
+                        "s" : "0x75861d0b7792d2ed22c3e60c375c0a5df9615643afed265812baca53c5c96106",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1014g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1014g0v0Filler.json
new file mode 100644
index 000000000..456fc9a7b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1014g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1014g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103f66064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc3de34c52106d6a4cd83262d5d77efda560fb130e0abbc1d4049fe9bf7a544bd",
+                        "s" : "0x45992edeb0bd9042faf0b787a59ed4f6b19660567cc128845d41772bc81813e9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1015g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1015g0v0Filler.json
new file mode 100644
index 000000000..880b29bf0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1015g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1015g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103f76064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x43dafd15edaabc7cdba06e38bd2d7efc467ba5eebcdceec3627a9109538217e1",
+                        "s" : "0x4ef68c44efe7ffe75e6743ce3c582eccbb7ea064280639f16e8814f60f4f266e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1016g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1016g0v0Filler.json
new file mode 100644
index 000000000..62ae2bb9e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1016g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1016g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103f86064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x055be8c98df833b0273a83f201c9ed5033b4597f373a6fcd591748b017de5f7f",
+                        "s" : "0x3ffb89c1de656d2c82541e6fe3a0574fa8ff23f1b2f081559ce1984d08fd3eea",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1017g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1017g0v0Filler.json
new file mode 100644
index 000000000..ca7a3cb9e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1017g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1017g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103f96064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf854cc06bac07db96c82e967b576b0ea68a93f5690416d7f2c71db9ecd8e2f47",
+                        "s" : "0x413dc5004dcf8752d8b950979619ffb8ef2716307d4f261264e9d50d61ca98de",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1018g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1018g0v0Filler.json
new file mode 100644
index 000000000..ac67d3713
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1018g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1018g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103fa6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb5e812977242664a5fee5399451e653f19167833a99a7a028be7fbea4bad1539",
+                        "s" : "0x41f533d19b135578de480d821a5163c4cc360b1340c2b98d3d539ecfbad8e67b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1019g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1019g0v0Filler.json
new file mode 100644
index 000000000..d83264d60
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1019g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1019g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103fb6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2361e359741c10c0f65a63583be52c442ade0cf5d07bfae2d1c1694d3e50b2f1",
+                        "s" : "0x521026df313d831b98bfdef9d2edada96c0aaf370e00bda2c2c6d27c11ac8c81",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d101g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d101g0v0Filler.json
new file mode 100644
index 000000000..143b90bf2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d101g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d101g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60656064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5f7006e4ab756e19fa8770c2a17867eb91d0d1b3fee429f065e83c4fdc0b64f1",
+                        "s" : "0x5f0bb600dd9ab3faa7b5dae26b32a0b7eeca07addfab950d178e1f948fccdd9f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1020g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1020g0v0Filler.json
new file mode 100644
index 000000000..e165d9b09
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1020g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1020g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103fc6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc5da372c96afc1f8f2f8c80d8947587f6e320f7268b478035fe2c8710f3dbb8c",
+                        "s" : "0x5c0d58150e17d94a03b2d2dd2ed800021b9e0cd4479cc82c003ad5d4ebabac39",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1021g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1021g0v0Filler.json
new file mode 100644
index 000000000..b8128d82a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1021g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1021g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103fd6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x569db160ebe9271846c55d70e0c331885d7c50814b8f0e880dedabc49f453538",
+                        "s" : "0x1b4081b6ecca5c6ee7be7a3aa3001b951e53f978dbd627b296f3a60e45289a5a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1022g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1022g0v0Filler.json
new file mode 100644
index 000000000..5b8da48c6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1022g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1022g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103fe6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaca932a56414276c1219131318fbdf0f2040c9296bec8377167bb7ede92702cc",
+                        "s" : "0x4476a2d0a74e354a834f770198f93152ed717661dcda7521f2e0b30cb06ced18",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1023g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1023g0v0Filler.json
new file mode 100644
index 000000000..a167ea546
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1023g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1023g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ff6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbb96a94175d87e445ba8b480f8180bb331a68562a078d7e898730a268a008c67",
+                        "s" : "0x5894698ae7dd3b123d0e9e289d53c9496b029f723b23483afbc2a5110814e9cf",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1024g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1024g0v0Filler.json
new file mode 100644
index 000000000..9dea3effa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1024g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1024g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104006064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc38d6074c0d44a046204cd5bfeeb7881b9071a9c527693bddcf72f365e925326",
+                        "s" : "0x1b8bfb64c3f0afed29c0ed6735b97e9439f72141a1fcea9b12a255dbfdccf91b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1025g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1025g0v0Filler.json
new file mode 100644
index 000000000..47d5e4909
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1025g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1025g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104016064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xce764751459e5217ba1d9e790399bfefd20661dd78be8f6afd71082029ebaa30",
+                        "s" : "0x5b88ce4c2405db23420e165427a4017833c8af9ad164af93bf3aad63a5c86e5a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1026g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1026g0v0Filler.json
new file mode 100644
index 000000000..a4778145b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1026g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1026g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104026064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x41bb10cc6dee846424b7173eab4cc8c07daa928fe05f277972452d7e05ebfd62",
+                        "s" : "0x29ae54d0d707a57fa25434a33a003ecb4c95be6dae002176ce2b1cdb9393ce91",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1027g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1027g0v0Filler.json
new file mode 100644
index 000000000..37685d962
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1027g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1027g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104036064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x94e2bf5964e86bc5c7ce4ffa1a633fe3d3cda7b51abc00ad1da18a4aea50a1d4",
+                        "s" : "0x7b29b23c3eb61dcf5206a1f2c69835a3ca59dcce5f1a23435edf9308ff1bab66",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1028g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1028g0v0Filler.json
new file mode 100644
index 000000000..211e1199e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1028g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1028g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104046064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x03aaa2e9572af27021bcef40c0df7605aa768537a30a36c8d27cd51b18999066",
+                        "s" : "0x3af2855d79d8943e3a73f4d91b9d78d059cbb9f5bda5c582d8d3215f24bbebc5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1029g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1029g0v0Filler.json
new file mode 100644
index 000000000..40e71ed6d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1029g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1029g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104056064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4d78d98b72b8c7eeefb07ad14c57d4bfeb83d9ae1cd9d4f43cafecf518ade3e7",
+                        "s" : "0x18ffac2a0f9dc0542d286a07073b19d5d8501ae112bb80f31ec1840c93946b7b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d102g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d102g0v0Filler.json
new file mode 100644
index 000000000..b7682e364
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d102g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d102g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60666064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa01c3e9ac1f305f3dba399d324497d2ce4878542f43c517832a3a78df620ae60",
+                        "s" : "0x56b515b6c048fa3e2c34a94e93e6c0f49c22506fbbd320217250df2736d95268",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1030g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1030g0v0Filler.json
new file mode 100644
index 000000000..31720508e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1030g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1030g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104066064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe5d77896d30afb5d5a05c308c983ad79f2c13641889064f3770ca0198f90fe70",
+                        "s" : "0x7f79da15cb6c1fa9132fa5f6e4fda0d1003ad6b838e44b90790762272c7d5afe",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1031g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1031g0v0Filler.json
new file mode 100644
index 000000000..cadb2f515
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1031g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1031g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104076064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcaa7a3251bca3e9bbd8da12a4ba8a954526f4797632f591a01ce61693922367c",
+                        "s" : "0x7e3d92602e5b24ada50d26c6c917fd628b60e2b19b23ad0bc06af55083c8927e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1032g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1032g0v0Filler.json
new file mode 100644
index 000000000..06643829d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1032g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1032g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104086064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x328d198ede3c6c7f5eab02d18ceee1c6489010155546c66cec975b92037cfe65",
+                        "s" : "0x3d43b69bc8ccfeb385f30e7fe6e5f6ce55d637aefbed7e4ff9ad69607e914d4f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1033g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1033g0v0Filler.json
new file mode 100644
index 000000000..230f5afec
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1033g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1033g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104096064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x42f8eef6f9e531a7a1f7905e4cb0876bfb3b0ba9a89efb66b9783463c9146d5e",
+                        "s" : "0x73d3703707f8c35d21815165bae8c0151e02ef6608064436ec88eb1a46994a9f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1034g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1034g0v0Filler.json
new file mode 100644
index 000000000..af4cc5c68
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1034g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1034g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61040a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x886f5039d9e781e387470e8223897885afa4e05e9f147e3d5d13d32855e4320c",
+                        "s" : "0x7033327e896b436c6e6c6ff3ce0e82f7a97a3d40f943f283fee5ca79cc2d7199",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1035g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1035g0v0Filler.json
new file mode 100644
index 000000000..1a2533947
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1035g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1035g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61040b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3beafd54396c9dd1229de98ec8355d4cfbd99e94a9ce1f0cba40984c2de70f23",
+                        "s" : "0x33a067e48d1275475967f40237e116ebf1bebe0256501c5b6fc7ef0038dbdda5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1036g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1036g0v0Filler.json
new file mode 100644
index 000000000..d096eb168
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1036g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1036g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61040c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbb2529fc66794e0d4a502277aae0d77268d4098c79416d6312dbe4acabdbb287",
+                        "s" : "0x4e0d941554967668ef89df98ae19a4a586ceef3f7c83d19545fda1187c910a93",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1037g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1037g0v0Filler.json
new file mode 100644
index 000000000..98462f56f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1037g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1037g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61040d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf7cea5c5efc89ecf7df75dc8acdeb696e9cdc1bed5e881b405a92dd5e9c7a3e8",
+                        "s" : "0x1e7203ca2ac7be2bddb58bb4d695b70454502836efee4e33d257a1666b90e454",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1038g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1038g0v0Filler.json
new file mode 100644
index 000000000..5aab58653
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1038g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1038g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61040e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe44ca159c177cb5317f74187cd62abfb1c758d0ddd11c51b6b7362682cfa9058",
+                        "s" : "0x6f648812beaeab4923b82158409e1b9b106b32d1b22bce88e5588d3ce9ccf9ec",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1039g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1039g0v0Filler.json
new file mode 100644
index 000000000..3555bdb6f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1039g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1039g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61040f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb013b2922a9d76fad1ea8b2523a2f715fff1f9e7b98e28a502ad3c5081413cef",
+                        "s" : "0x013fbf920a1f129a3e99cac07cd2889040d10f708de4761c3b45726bd032657d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d103g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d103g0v0Filler.json
new file mode 100644
index 000000000..bda7b046a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d103g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d103g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60676064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbed9187aebd8a26f78f665a8badcc4da700adc5127f497936666506f2fada8c3",
+                        "s" : "0x6828e35b2b3e67a63a8418de5aca3b29276f7bd394685145c6a007424aa737ec",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1040g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1040g0v0Filler.json
new file mode 100644
index 000000000..d37c4d21f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1040g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1040g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104106064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe1e7c1251571bb2ef918d117d5f309448bfb72ac929f6adc458f6f9642898365",
+                        "s" : "0x42d37b104236a2a2ccdede034da1bb6d3684076f2ac3a8a76ba308e4a7173763",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1041g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1041g0v0Filler.json
new file mode 100644
index 000000000..fd7c5c1b9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1041g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1041g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104116064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x07d8a02ca008047264d16fe3ff0fc7a2334a2e84fff3a5f150ee79a590416be0",
+                        "s" : "0x584a82c3acb7e55809546a9a4fd74e5c80fd2a2289b33aa1ebf9a1f54e4dd6d9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1042g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1042g0v0Filler.json
new file mode 100644
index 000000000..a5e50dc35
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1042g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1042g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104126064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd62940e5298d363bf4c64a7dd5c6d0a004d1f1b256898e54aa236282e25bbb31",
+                        "s" : "0x5bfda3deca8d0f6fd5dc054543094c4b3e3d2fac3422a777d889660cecaa5aa0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1043g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1043g0v0Filler.json
new file mode 100644
index 000000000..245ac69ad
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1043g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1043g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104136064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2aa9e4c0caedfe191ceaed3fdb9c164187038aae6f709e350e6037637a641ae6",
+                        "s" : "0x3ed8e480ef4bcba73620a1a1648d735a4bbb7b177154442cc939ecf16378ba2c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1044g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1044g0v0Filler.json
new file mode 100644
index 000000000..2ffe026a8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1044g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1044g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104146064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb3d43e87e9b8df4514fd041ae78fcdf705e0c29dce5f169886fb4abccdc3e0f9",
+                        "s" : "0x74b94a0c45f27d047ad05336036cc4856f29e6b1426ca0970ed56134c59d9d39",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1045g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1045g0v0Filler.json
new file mode 100644
index 000000000..b571d8191
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1045g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1045g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104156064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb3e9adaebf386388e7349d7236b85ef9ce95b56c3c909513e9b75668919350b4",
+                        "s" : "0x31f164b776af0a7021e01cd87a11665339b6bcd90d5445ea6e22cdc2e255d25b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1046g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1046g0v0Filler.json
new file mode 100644
index 000000000..9932743cc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1046g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1046g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104166064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2d5160b1e87ad5beb4fb1065dcf28cb84ab9bd2ec804a82096cf142ef9969c2e",
+                        "s" : "0x6ceda220a78f1f22090ef00ef9b6c66da2e37c7a5a37b3cd4dcb81511bae4926",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1047g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1047g0v0Filler.json
new file mode 100644
index 000000000..799406d5b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1047g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1047g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104176064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x46a660a2bf172d2ae31606cef9aa0350a036375ed36906c7547ee192504902b3",
+                        "s" : "0x171c923046c997c7208230da2780cb86be8e11d4722d3da17859d7838eb170c3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1048g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1048g0v0Filler.json
new file mode 100644
index 000000000..358f9e5c3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1048g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1048g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104186064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7718416704a6c289aee339714173eef97564117cc67e24c1779b6072d77a7c96",
+                        "s" : "0x269ee1408bf531e0fbaa3589724f8e1578c4b49bbd999dc04760418a7b5f65e6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1049g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1049g0v0Filler.json
new file mode 100644
index 000000000..2cff9435f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1049g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1049g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104196064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd9325847afa7d94e2b02fecb0fdb20c0c7770a2f36d46c518cbb3078722635dd",
+                        "s" : "0x7572e1013461f4a5225aa0e1e1fb6f9bf74bc26d586bac955886afb32574de86",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d104g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d104g0v0Filler.json
new file mode 100644
index 000000000..353555302
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d104g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d104g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60686064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x80c3ea5b90fbff015cfa5d0829be8b49435bffab1f7f42d962803385242baf94",
+                        "s" : "0x44d24eb5b0a4f63436707d95feeb6d83b52fce09859bebe817f6abe4aab64bf3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1050g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1050g0v0Filler.json
new file mode 100644
index 000000000..64e62a40b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1050g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1050g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61041a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x91f5d228f747f3a7e0bb4053a7e9bc8686d07cc541042c1080c2d35d3790ab54",
+                        "s" : "0x377f9de1ad86e31983aa5a75629c7d33679ea652a6e96dec8c0c4aa938ccb37f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1051g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1051g0v0Filler.json
new file mode 100644
index 000000000..e73709f1c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1051g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1051g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61041b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa430097e26eb45628c6f14069ab29f49d09acf40c0bd87c7a5b5361e61934aa6",
+                        "s" : "0x056560188de42744f5b1fbabc56737a8ceef25df3baa7588fb622c7322dc02a9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1052g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1052g0v0Filler.json
new file mode 100644
index 000000000..5fd80bfa7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1052g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1052g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61041c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x064e1287d7a39f1fd9f2ce134f2c4c0823ba6e37c58ffbdf3d9b03d7508bb27c",
+                        "s" : "0x21d6405221c9d98e8a0e020a60949363f392a9fcac09b218b4000b45bad8bd4d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1053g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1053g0v0Filler.json
new file mode 100644
index 000000000..5ace10b73
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1053g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1053g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61041d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xda37c8623b85528fe359ca7f29b8924f943a45e837cf668d65f5bb1ac1e2ac6f",
+                        "s" : "0x3c3b0b9bd8328778f59bca6bcdea80f49f57786f5d8ef6f5c6c2e3d04026ca7a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1054g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1054g0v0Filler.json
new file mode 100644
index 000000000..3f43cae3b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1054g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1054g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61041e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa017318fa9b824c5927ad31ef5663f502830c03e2be9730711bdc29ac78051cc",
+                        "s" : "0x66812c4e1fd52d136e7f301ceaccd36c42239b2e1608b9a81390b322a2db2c7f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1055g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1055g0v0Filler.json
new file mode 100644
index 000000000..fa1c1c26b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1055g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1055g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61041f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4ded22c1cd66a887a9a0a6cff7864bb685406a575c6571d2a8e34e62d55f81d5",
+                        "s" : "0x499118ad402c282f287d76498ca81b5da6fa68b6f2bca247ab94a1d1cac905a0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1056g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1056g0v0Filler.json
new file mode 100644
index 000000000..be937c5dd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1056g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1056g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104206064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x12b9d808c9603682c7825a81901a2647b1815370fcdd662f6764d7a2fe64e368",
+                        "s" : "0x41894544f018ed4a5443a572028aa2f45c4f149ccc53f94c985329663eaeef25",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1057g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1057g0v0Filler.json
new file mode 100644
index 000000000..1bc251104
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1057g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1057g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104216064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb563bcc322aafd37b75030617987ee5658f12f8f16a52b589db28983dfaa9244",
+                        "s" : "0x0fe294de84be4391d54bdb30874be5ccdde9bcb830cb62019adc32a8f98955ab",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1058g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1058g0v0Filler.json
new file mode 100644
index 000000000..5f4b45ec4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1058g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1058g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104226064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb117c09dcf552915dcfe1e93374b6575d423cc11773be05eb01f205abb9f20fb",
+                        "s" : "0x646eb27d4bf6a30e37fa9a33fb789b33ce3d7db7c6cd23b3c130ec133156846c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1059g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1059g0v0Filler.json
new file mode 100644
index 000000000..08626987d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1059g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1059g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104236064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x27d668f67ad581012871b9bcc57a7744951b588449156c41cf136240c180522c",
+                        "s" : "0x1d264b09fdc398c6989c4e6ff60516797fdfc86be64f47c7e3058a46334605a8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d105g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d105g0v0Filler.json
new file mode 100644
index 000000000..876904e5e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d105g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d105g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60696064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9cc1b4ad17fbdd62bac9b08fad7967453af08a00f57a8f02ddd238f2b46addb2",
+                        "s" : "0x407152087d7355f2cd10558d3dbea913934b5c9135d81f87b729fd6fd7f04d74",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1060g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1060g0v0Filler.json
new file mode 100644
index 000000000..11ee373d3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1060g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1060g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104246064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd5180ab306b68cc7a77e5ce8bb270fe8f1e75a11d614d2a79d8dd38ee6acbe0a",
+                        "s" : "0x4d4c7c36d34034ed18c963eb06ead59c5392c5df8d1c974c389e42d2b302a61c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1061g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1061g0v0Filler.json
new file mode 100644
index 000000000..d1a5207de
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1061g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1061g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104256064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3525c560ba9853d40071865d65d26f27729aef1b8226ea81f9eedb0668959529",
+                        "s" : "0x69cbe44138b2ad48467988c4dabf8dba8e778081e15350d08bb294ed36fe5029",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1062g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1062g0v0Filler.json
new file mode 100644
index 000000000..e325023f1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1062g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1062g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104266064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0be903723d82e04d3b16b21fa5a4265b8e46da05eaa2424c4bd8db2105758bb4",
+                        "s" : "0x5fdbf5dac0b3970c24a1142eba06cb814d91ee3d503decc8e5527e040de2aa84",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1063g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1063g0v0Filler.json
new file mode 100644
index 000000000..8b41e800c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1063g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1063g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104276064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x17c5a30e694d91b2efe809994aa5e8e33c9e96f6ec0b4c11ea6bbfecacaf6b3d",
+                        "s" : "0x6ddbcc34354670089fb2095cfde74ca9aa712d61f2294bba72821cc2646de4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1064g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1064g0v0Filler.json
new file mode 100644
index 000000000..9cfcc5701
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1064g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1064g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104286064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x14f7b891eea41c0edc095b609469b953683e168a4dd45ed7920e86f195763b98",
+                        "s" : "0x728b186883099c60d03640e2ec892aa83d75cf8452d961a419b324ce95226ba0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1065g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1065g0v0Filler.json
new file mode 100644
index 000000000..7d59af949
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1065g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1065g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104296064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc96fd034ac70d1233b38386f55ad73cffc9e7c2d73a1d006c6649c5ef9acc489",
+                        "s" : "0x4b0b0afedd19688ec1bd86f528910fb922de16e74beb2a77f63d6aa36958104c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1066g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1066g0v0Filler.json
new file mode 100644
index 000000000..f04d888e2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1066g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1066g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61042a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1c41b3b3be1671037fe98c5c47d3987659c7df27b251bdb5e07f63e3482f8241",
+                        "s" : "0x62e7768e36c988cd4db6f97c9a1bd3115b91e40ea6fb7a16a9d76e57e6a01add",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1067g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1067g0v0Filler.json
new file mode 100644
index 000000000..f58d5d851
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1067g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1067g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61042b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x18de70b88e0193e34cdab0f5f4bf33c180ff17e02a1d4e5648db2951f96547dd",
+                        "s" : "0x2a624d43320e5716618f88989e7a3ef17473abdcbf245e1a4fc922850187cbce",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1068g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1068g0v0Filler.json
new file mode 100644
index 000000000..5841b1567
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1068g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1068g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61042c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd323aac6b341c49f3e3ca54a8b0cc69bb79f61a9bd466e44e6e5e46bb5f15ed1",
+                        "s" : "0x2bd80c98d324727063cd56d470cae09a649e5dd92731aa39cd6626f9b4e5d6b0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1069g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1069g0v0Filler.json
new file mode 100644
index 000000000..b43761f56
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1069g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1069g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61042d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd8130f817add4b262c54d5cb9226391b89602b5f5d68deb869de80264b887cda",
+                        "s" : "0x2c2c063af642591c295578217affc51f45e39b373e53768a1775ce45adc175dc",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d106g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d106g0v0Filler.json
new file mode 100644
index 000000000..c1176f070
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d106g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d106g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x606a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0d3a57f2721b38e03c9bca8568806f0e2293805f5460f6e99c59f303ca12e26e",
+                        "s" : "0x1118a71de8d85ab4912957b00bd7f264241af7341012f7ead34ddd6fc48cca12",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1070g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1070g0v0Filler.json
new file mode 100644
index 000000000..f6062b9d7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1070g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1070g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61042e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9eebb02462dba66e07d0dd5ef6af3c6c6773f0c3382beb257b01d5b49289360c",
+                        "s" : "0x08769cd47f561eb9f847be72c9c9a668285c41ea6c894d3715f97e97d0cb9219",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1071g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1071g0v0Filler.json
new file mode 100644
index 000000000..36bdaa05b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1071g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1071g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61042f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3b6354008f772a2c34d1507219d52121fe787b51f0c4c2ab4189a710b043c035",
+                        "s" : "0x250bc6a2031288ef7ef45374e4e0892bd5717e6f3c2b29a2a3f8f7640760819a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1072g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1072g0v0Filler.json
new file mode 100644
index 000000000..956f72c87
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1072g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1072g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104306064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf73c2bac8d5c8890781930392eab4a6398c6a22b8115ac98ba69c5a4b650c5de",
+                        "s" : "0x19a97f401f9f55012b46acc61a51d2d10022fc0b169420e5439863ba961c3396",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1073g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1073g0v0Filler.json
new file mode 100644
index 000000000..ae151af5c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1073g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1073g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104316064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x37a9f50d418c9040ed186eb07b0da56c914c59a55478f3d063873355ac658d22",
+                        "s" : "0x4c8510adb3d1296d7dc085c201616808bb65f65e5f4ab50f3eaef42ee257411f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1074g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1074g0v0Filler.json
new file mode 100644
index 000000000..321dadfa7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1074g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1074g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104326064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf65fbc7e4b1c48cad17d7c684156bd1ba1dbeb444113a1dce54ee4ad748a4524",
+                        "s" : "0x22696d882089917c3f1e8d2cc9082de536a0161d385069c9ebaf274bb919d020",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1075g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1075g0v0Filler.json
new file mode 100644
index 000000000..3b3a0d47e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1075g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1075g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104336064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbf8bddea4c265e4bff3d51d11d631cc4ebd3265bb5ee31e06522d61267f55a02",
+                        "s" : "0x0efdda2ebf5ed18c7b1dc8d0d99735cb06936f5ff2a9bb323b5155da06d6057f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1076g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1076g0v0Filler.json
new file mode 100644
index 000000000..c836d5c82
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1076g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1076g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104346064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa42d55c1358158806dadc88d24fadc842abd2fc2efc50e3f3e32aed79bcc1b61",
+                        "s" : "0x64df6e03fdccd7bcf0880322e24e60fa6cbc09ae023ef40526660560bccd56fe",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1077g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1077g0v0Filler.json
new file mode 100644
index 000000000..4ecc99a2d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1077g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1077g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104356064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x66dff126835bc2eb19d0f638f67ed0a7ea84cc9ec7d81d503c7612860c89e513",
+                        "s" : "0x0808abfd262fd9b9458aca0e481acaea5de73d016413fc91ad74ed4c25bc65a0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1078g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1078g0v0Filler.json
new file mode 100644
index 000000000..91820f6c8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1078g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1078g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104366064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3b856b87b2de4c9a35ddb7ce557af1ed0001e3ba25f4988b744259f103064956",
+                        "s" : "0x4687da5216a0c37f4b7ad54196fcc9b68a409200caaf292fbc142faad5505f9f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1079g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1079g0v0Filler.json
new file mode 100644
index 000000000..a32c3a3a6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1079g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1079g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104376064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x56bd3a1fbe37c16676efbd284eed6bd7d446219ff4a32b77cd72b7b96c22c2b9",
+                        "s" : "0x20d5dbfae634bf72648d128b21b11734b6dc709b99f06c207dcb35a9ee35f9ed",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d107g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d107g0v0Filler.json
new file mode 100644
index 000000000..4f520bb2b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d107g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d107g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x606b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xed8f343bfc8f1212120e81333f9550c8eab894dd7fd221b6fe35d5a5332200c1",
+                        "s" : "0x0d099af95f8f5743c85b3b85edf82a4d8d564fefe412c3ae5911238214ca800d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1080g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1080g0v0Filler.json
new file mode 100644
index 000000000..8b5ce346b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1080g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1080g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104386064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x85948d425b957fd1c78321342f0c61c089b68df7d21541e3e114b95592507f50",
+                        "s" : "0x1e75f0db3851f195752bd42bbb0baa41438424bc20ee1f96a45b99e8e5fdc96b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1081g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1081g0v0Filler.json
new file mode 100644
index 000000000..7b4b19f4a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1081g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1081g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104396064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1f48fbf05d7485361f4c5f1766b60d4e985f9637c268397a97d8144a857ac034",
+                        "s" : "0x126c92d18a9c2d613a8c438a416e17330fa3cf8c6401379bcdf30653ba70eef5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1082g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1082g0v0Filler.json
new file mode 100644
index 000000000..bb3f048ce
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1082g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1082g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61043a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x62244d4904e357160a5cd1f61c1f3f7794a0add20e1624ac99989b674a3fd1be",
+                        "s" : "0x01a4e96f39834889947cc3b5b01dc85eb86cf4dec0bd57b8782d26a2144f7d31",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1083g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1083g0v0Filler.json
new file mode 100644
index 000000000..366b11e8f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1083g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1083g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61043b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3a009bbdc17f7d67d6d2a757150a36a95a2d26669727ff059f9aa681ad240d4d",
+                        "s" : "0x39bc18f2da92ac2b08ee67e25789954fc344dccfaf8effffc335c8a314de19af",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1084g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1084g0v0Filler.json
new file mode 100644
index 000000000..c538f3158
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1084g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1084g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61043c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x39807945e597d214e97c64e0494d065fad3682d37968bfef289473dab665ee73",
+                        "s" : "0x7ed08cc89ecaa9729b87586a3bc1984d8a796e6993fe75eebce69e2a7ee56d12",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1085g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1085g0v0Filler.json
new file mode 100644
index 000000000..d1563c05e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1085g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1085g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61043d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdc63f0c6e11d9bd3b7803f020e76f0aa0cde7c5f38dfb45cbb057d7bef4800fb",
+                        "s" : "0x07804fdff03f645c488608b0f448f9f661b656afa3707820936dc46520e080a9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1086g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1086g0v0Filler.json
new file mode 100644
index 000000000..c01a57ffe
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1086g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1086g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61043e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5a35d14648ccc8871f98eb5dfd67685512e24332875f9f1c69ce761717d74e59",
+                        "s" : "0x0b23732d8634799770eb2613d4e2169d8c083896cb88cef88c66316458e6b3e9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1087g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1087g0v0Filler.json
new file mode 100644
index 000000000..981a45545
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1087g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1087g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61043f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x95e31e33f3c59a72927b24a32fab15c8116df1559a116a3bfb29e6fe8431c59e",
+                        "s" : "0x4290535dc5af9e10e95de2318e99224d1c9c24317d4baece530d6063cd59bbdc",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1088g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1088g0v0Filler.json
new file mode 100644
index 000000000..69913fb57
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1088g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1088g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104406064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf53155f1bc83344a01493f17e43cfaed309c30f22623d01565e39f5fd9b46c9a",
+                        "s" : "0x74cb4d0cf16326541d2a9a6b5009d795dfb0b16f5e98f38559ed857cd2730f6a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1089g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1089g0v0Filler.json
new file mode 100644
index 000000000..4d856b8e6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1089g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1089g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104416064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x12d8af7995523085f3374e44f0f217ce2b3ece5404d23d8732c587e6b9ff740a",
+                        "s" : "0x2e42152552d923aa8991c4b4d9025f17209e3f55d2e18820519407f4308c30b0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d108g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d108g0v0Filler.json
new file mode 100644
index 000000000..e3b5400e8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d108g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d108g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x606c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdd03d9706620261d073d622f521ba37a17946fd17d7211037deb9905a6d5f6f3",
+                        "s" : "0x701bcec9c0d80a5d6ecec7f181129cdd243bc8ee97d54a718d8f9c785f4eba5a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1090g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1090g0v0Filler.json
new file mode 100644
index 000000000..2fac1a733
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1090g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1090g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104426064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc21f7728aff0f49a61964ed4ba52f7d4df52993a8b03303793eae7d3476864c7",
+                        "s" : "0x24016e055ce7378567b08377dfed79c3ac3166ae01db263fbe2cc56396fbd880",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1091g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1091g0v0Filler.json
new file mode 100644
index 000000000..a4b004ce6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1091g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1091g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104436064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9f8dc27cf2021dcfbf0768a8413591a6ea7b0d64b1dd3fd568cfe34310a8f290",
+                        "s" : "0x7af968982e77bff34e5d5047ea8d8e96283c24b37e8521dd2cdc71b87b29d6e5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1092g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1092g0v0Filler.json
new file mode 100644
index 000000000..4d5426d76
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1092g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1092g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104446064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x673130f0e4becbab32aa4e363162f52f79f6c32e016925d548710b3060190137",
+                        "s" : "0x1d161191785d1ff44dde99f92f11d2dae9c3270e18f9db6b62cb4bd1e58a9c97",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1093g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1093g0v0Filler.json
new file mode 100644
index 000000000..4dc814b9f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1093g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1093g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104456064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2292b4da40834a2d6bf6c9d6dc4a5af726c3713624e8dfd6fed8c616fbbb04b9",
+                        "s" : "0x5ad6453eee9f24d71964f502c365efacbf371fbfb8de45912f14300eb4e44a3a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1094g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1094g0v0Filler.json
new file mode 100644
index 000000000..b7e952ea1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1094g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1094g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104466064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x68748cc9ab1eb1be066e7e3b13bd140368738c02aeb26ffd5603cad3cff5d9e4",
+                        "s" : "0x74a35ac2726e9bd9e5e3b40901aafcbb1f9549e9f40f4dc72c34d756e18d5033",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1095g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1095g0v0Filler.json
new file mode 100644
index 000000000..7e3bf4636
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1095g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1095g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104476064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x43880b941e7f27cc3a416ee7aac7d3d8b936e1a5b9a64482ea76c16a53822454",
+                        "s" : "0x6922c597424c00207218e9412bbac048ff7c0ae018c37689078a7c59e3a4ec13",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1096g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1096g0v0Filler.json
new file mode 100644
index 000000000..83fb98901
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1096g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1096g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104486064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x95882efd13924b43e3f6911e4593ea4f8ef2f29aef86ad0e2ba19e8449aaa6",
+                        "s" : "0x2b9b5fe1662555da848da42ac928714933be4734c39244bb5fbcb5af4c834573",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1097g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1097g0v0Filler.json
new file mode 100644
index 000000000..16f78df4a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1097g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1097g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104496064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc62de983332e1e4187a7c263324762ae7b9a407f992df66de8bbd677085f79b",
+                        "s" : "0x3bce9c47007346773390398cf703141934d66495c9a920b62ea96bf7ec8c220b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1098g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1098g0v0Filler.json
new file mode 100644
index 000000000..04482c157
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1098g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1098g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61044a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xad5296b60cf4a0ea0cf491a668023fd94a7da146c3a964ec67590288854004e9",
+                        "s" : "0x51f124dc93014d091babaa7fea818251e4ee068ca6dd281f99888b7ac7e31cf3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1099g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1099g0v0Filler.json
new file mode 100644
index 000000000..704809fe7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1099g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1099g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61044b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7c9f0514b14bd8ab308310e4d980e0c72a666dc0de242ef1b1086f5239c9e92b",
+                        "s" : "0x5156f6388287e064b0b3436c88427a636fd62b2ce0f640ac683278ffa0618df3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d109g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d109g0v0Filler.json
new file mode 100644
index 000000000..86a6d00ac
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d109g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d109g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x606d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x55edd7ddf0b25188be75131a8feab932b0a30dd1a36c5a8593d237b417108975",
+                        "s" : "0x50ab7c80abda3ea01937c6337d2bcc2d1c24f2d76d11ab9abff9d3840a81026e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d10g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d10g0v0Filler.json
new file mode 100644
index 000000000..72c1caaa5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d10g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d10g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x600a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x219012910aa2946ba923e697466f736f30524913683786f16e81b6758f5c48ed",
+                        "s" : "0x39d751f91d0ab3f22dc8ce85b0e3d17d11418195e667de163291ae10e08393b8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1100g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1100g0v0Filler.json
new file mode 100644
index 000000000..a05a964b9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1100g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1100g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61044c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcb3642fd53227e89234f18424dadadc22f013b324ca726b120e3989cba16d727",
+                        "s" : "0x74d2dc4deb8566765fcaf186a41cb1edebd18c9f5817237e672767407935a87f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1101g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1101g0v0Filler.json
new file mode 100644
index 000000000..e0bd9d873
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1101g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1101g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61044d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x444ac583582d7d069f1e3038c98d587f8b361be4ca55b9ed5bde7259983ff000",
+                        "s" : "0x2e1f7758c950cb8a074f798535d7c7794ce15c633d06ebf24f923ba5ec26694a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1102g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1102g0v0Filler.json
new file mode 100644
index 000000000..87267b075
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1102g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1102g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61044e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3796c906172b3b170d3b8546d6cf598d9c6f84caaeffeb3bbcf0e7a1c69fd07a",
+                        "s" : "0x54b65d618d71b7e8d5993328c97b835ab3048ff2def713226fe7909bdeae7dea",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1103g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1103g0v0Filler.json
new file mode 100644
index 000000000..10b2fbe01
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1103g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1103g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61044f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfc0bb81a6e9c692982a5f1bdf9b72b9cad8ff81d2d7f0c353d318752b9044c79",
+                        "s" : "0x57f068f6dd0bd0aa965467d8bde18db36ee7b2975a251e82c172495cff4c005a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1104g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1104g0v0Filler.json
new file mode 100644
index 000000000..1352af6de
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1104g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1104g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104506064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa7b8b149aa5f7c0b7613c9932f717981ecbf286196ed855999e4307ac67aaf56",
+                        "s" : "0x3fb38a2b1cca94eac6d2dae9c2208aeb5d3c066e431e0c320766e00786a398d5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1105g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1105g0v0Filler.json
new file mode 100644
index 000000000..c86d1fe78
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1105g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1105g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104516064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4cd7f11642c016fb334f9ae37c7c159dcb562437578f171da96a2d9e3d222277",
+                        "s" : "0x22157d91555d4c5858ae1ac09a02eb25713a0bed4f0ed9485cb01209c8192a1a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1106g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1106g0v0Filler.json
new file mode 100644
index 000000000..c3e8a19bb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1106g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1106g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104526064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd99e4c4e54f34721461906c30101e6d1c310b4a2249ff38e453cfb3018c33bc5",
+                        "s" : "0x147cdc1b00ab4b290fd91d393ea374a7174f9eb9ab32723298fb4d8f64d89ef1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1107g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1107g0v0Filler.json
new file mode 100644
index 000000000..834e552a9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1107g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1107g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104536064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe358be5e3e057a4ed09af7bd0fadf29d316138aa651b1669323995b00f3532ff",
+                        "s" : "0x015dafab0f60087ad7f906f1bb56296b0f9110de2546ecfc8e2b8289bbe2f787",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1108g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1108g0v0Filler.json
new file mode 100644
index 000000000..66f34b3f3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1108g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1108g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104546064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x88187934cdf1bf5e9e490bccefe397121dcd8e7c8a49f262cc8f4d5dff20fb5e",
+                        "s" : "0x144d49d5b0363cbf832546f7dab8fb9978b56dec723a597cee533ad6081b5399",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1109g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1109g0v0Filler.json
new file mode 100644
index 000000000..7b70489ae
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1109g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1109g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104556064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4413fd699f999c487a4b916cf8860baace12df363890019b26482088c84809ef",
+                        "s" : "0x42f15a820bd63b51df498998bfc3eca270bc87cbd202b7506bf81bf261756c1e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d110g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d110g0v0Filler.json
new file mode 100644
index 000000000..f4126baf4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d110g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d110g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x606e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7da5070c3649f7a51a4cb7e24d7db3120c6fc11197bad2813549b6988f675195",
+                        "s" : "0x690ca228097e7bcd57fdd83658cffaced43b3d6503a57ab2a85d31f53909db8a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1110g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1110g0v0Filler.json
new file mode 100644
index 000000000..415718ebe
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1110g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1110g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104566064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8cdfc2cb9cdbdf2f786d2c6451325ac4989a024bb22d93dc2084f6000df0fa65",
+                        "s" : "0x76749b557e418f5b90d993563fb21b5b3f3a398fc6905e6e4b8fb8ac89912304",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1111g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1111g0v0Filler.json
new file mode 100644
index 000000000..5a467e4dd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1111g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1111g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104576064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x54d0a3ce00a31bf81120965600402f1c71dbfc7ac4a2522bdc5caef9c09ece65",
+                        "s" : "0x2c5060880a3936b551b76887f75057709d7ef19e26e3a59562b11c7be492c171",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1112g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1112g0v0Filler.json
new file mode 100644
index 000000000..cb73c8119
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1112g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1112g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104586064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9e4b63df25d4da8a8021037d40c9bf78153172c82e55c378875338943274c10b",
+                        "s" : "0x6d19fec7497309e24b394f10de3bad5ab6bbe94193c68a993251e5e8d7d78d4c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1113g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1113g0v0Filler.json
new file mode 100644
index 000000000..1135c3732
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1113g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1113g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104596064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3c6d3f43604c1cb6dea2bd879ad4bc19f847c550431ec999c28cda21c8e44222",
+                        "s" : "0x175a0a578778fad74ea2890b591cb0b1790f9e8c3c8ddf16c6440737e77ba20d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1114g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1114g0v0Filler.json
new file mode 100644
index 000000000..d6bda6a61
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1114g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1114g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61045a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2c58aae09487de78df939529b287c8a9d593a5e946dda121868a3dde55e716fa",
+                        "s" : "0x0b1f310171e7b111bc62a05c36420bb985f74d530043fbc4ba0cf9f56d24e66e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1115g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1115g0v0Filler.json
new file mode 100644
index 000000000..9f7030533
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1115g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1115g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61045b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8f9b0c2a9c98ad3641d79661cfde41ebcfdddad3dcfc127b85994dae6d852237",
+                        "s" : "0x37920def9bf43b4a2e79a554b2c7d794d669ffaf5c14522717ef5579f2fcee79",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1116g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1116g0v0Filler.json
new file mode 100644
index 000000000..26bfa5912
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1116g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1116g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61045c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xed639541b1f12c6c4f8cef2b828d8f79a9a4e6b8a28530f80223e9b209afcfcb",
+                        "s" : "0x1151e3781a1bbdffed525d284641177f346b898d0bc99294f76e4e3c3aa41338",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1117g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1117g0v0Filler.json
new file mode 100644
index 000000000..620c53510
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1117g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1117g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61045d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfe732e71c2d341aeeb3e22e7b3b994ce49cb76806e765339a92cb519222d2596",
+                        "s" : "0x13af2d620baab52ff46568b884724ba4f64dc3319c3d0c0c976a74633c146f05",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1118g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1118g0v0Filler.json
new file mode 100644
index 000000000..c91da0236
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1118g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1118g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61045e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd300f57db1577703b067df4b7f99cff8cc4c621c559030ae6d9f299ba9974ac2",
+                        "s" : "0x762b3f5c99f638749e598abb60f9323ad990f54214d85f1d5479b3d9680705d9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1119g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1119g0v0Filler.json
new file mode 100644
index 000000000..9ba67857c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1119g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1119g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61045f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1fb498038b4cb2dbc822b699f85f5a067e17a04d9331e9467c8a42419082e1a1",
+                        "s" : "0x2faf90e07c63e6691f52d2087378cbd09b62f83e124428e8cf1a24a0ff0f28de",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d111g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d111g0v0Filler.json
new file mode 100644
index 000000000..952b2908c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d111g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d111g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x606f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6fad85ffd4edbb7a42726408e3d87be4de999496f30354c952ef636997c59ceb",
+                        "s" : "0x5b957590937414f5a78a4c6dd4f1f150b48b724355a2fce1aa49df6280285375",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1120g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1120g0v0Filler.json
new file mode 100644
index 000000000..b7a5b1051
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1120g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1120g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104606064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf4c82f338b93f5acb1dfc62f7826b0c44391ea693c3838918e937ecc0f590bdf",
+                        "s" : "0x560c27c7354b31fa37a09a7420d8814662e5051de931d9a158f75065af6fedbc",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1121g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1121g0v0Filler.json
new file mode 100644
index 000000000..c8cfd4cae
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1121g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1121g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104616064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeb48ec818c24f22812eb8e91c89b54cae7f6234ffc06dee2d5ff85398e3b592f",
+                        "s" : "0x17ae8587e6166eb6674d43817193aed5c8e8e7e9842d776380eb8fa561bee21c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1122g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1122g0v0Filler.json
new file mode 100644
index 000000000..69007666f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1122g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1122g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104626064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3463a656da88e48a60f4e379fe2bfef11b329c06e9cab92d7a47252cf4c67d7f",
+                        "s" : "0x023f797d168cae6513a3ebc891fcf66b07a61f0b6b616d6a6c96724002408254",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1123g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1123g0v0Filler.json
new file mode 100644
index 000000000..fad617404
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1123g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1123g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104636064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xde56dff2a88eacb5348c00d22f88fdd94d8fa3ab0a92159e165c7616a4bb5180",
+                        "s" : "0x33807355f679b067545d6ca6e8d3a895df9d8c2d3d99b5980e0d8a37b99c74eb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1124g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1124g0v0Filler.json
new file mode 100644
index 000000000..003123308
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1124g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1124g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104646064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8feb9017644d0447a990f6ea38173da6ac5ba0e2b5dc8c5ad16a2c0fdbde089c",
+                        "s" : "0x343ed97eb28c0bf572e85caf5eb917dbb18bcf0a390e99955d012c6fa5c65d39",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1125g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1125g0v0Filler.json
new file mode 100644
index 000000000..f541e6573
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1125g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1125g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104656064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x813e8441f1cf4a82663f9a8b702a420d793d96758b9df56788c6d42b5034d50a",
+                        "s" : "0x7ee9d6088ae6ebc9ae032473eca1d3bc13b54b1b93382085c797059fb91519ee",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1126g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1126g0v0Filler.json
new file mode 100644
index 000000000..11b2d8695
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1126g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1126g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104666064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x45b0915059b39877fd3d28665bc657f0f37dc9b71d9d26699d42d8c538da5a3c",
+                        "s" : "0x2ec47a625e2977f61b4560f37c20fe542f361f1a1034c6319de2b527d785dbda",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1127g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1127g0v0Filler.json
new file mode 100644
index 000000000..778628c61
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1127g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1127g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104676064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x988bcd36f27d76f2171398795392f54bb0fdfd988bf56a8d5ba49f34c9998ba4",
+                        "s" : "0x717be6fd0217a2ea18fbf772f842d10a415007e4840f5df55b2de820174154e3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1128g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1128g0v0Filler.json
new file mode 100644
index 000000000..1d3199e23
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1128g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1128g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104686064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x848efce765b9cc76d713109dc88ecaed7e2922f0842b632ae75577ba0f96fae9",
+                        "s" : "0x1367b17a541615df64b01518f70d43ef36c165de0f38cabd79792a087b2bebc2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1129g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1129g0v0Filler.json
new file mode 100644
index 000000000..da1d1a955
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1129g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1129g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104696064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe6138cac0bc47d00545ba0effff70fed8352d03b3f2308de4624bda65b13b7e4",
+                        "s" : "0x1818f7876d206bd3993e08a759e492276e0d1b3ec303d73502dc67f8b3bd676b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d112g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d112g0v0Filler.json
new file mode 100644
index 000000000..9a6a65425
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d112g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d112g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60706064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe4d4e823bab6bcb6aa24ee9bce1781455f869d0bf17f7dd4939ce3341f3b4d2e",
+                        "s" : "0x4a484b9b46a92dced55b0d977c446dcd680741d7efe0644eea321aa8f007a683",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1130g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1130g0v0Filler.json
new file mode 100644
index 000000000..81d6ad82c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1130g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1130g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61046a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8c87092b612dd4e46c6b903ccaea393028fdf31b227f8905710d0de23e2b4aa2",
+                        "s" : "0x558aabb0266101d14e4776a99880be7dab348637c91de99cc8b5c63e179f638f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1131g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1131g0v0Filler.json
new file mode 100644
index 000000000..50c8c4a4d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1131g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1131g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61046b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6648b36cdf9cd366ab913aec869b92ca68178b496b0111a02928b62ff07beee9",
+                        "s" : "0x024e17a2992205aa650500b7a8a19da3e3e0fa917a4e400502ac0098ff5fc3df",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1132g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1132g0v0Filler.json
new file mode 100644
index 000000000..4da24e87d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1132g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1132g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61046c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x22b67145f45509745e2982617bfb97c7da5b2a7b9cd04bf452e97f1f1108db7f",
+                        "s" : "0x41b6e9093db363a49e185c1cf08f782b87d3c1d512dfbbd066d9a705fb94b8e7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1133g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1133g0v0Filler.json
new file mode 100644
index 000000000..878ab2850
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1133g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1133g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61046d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1685152626716b10f962ce9b56d015f2089bc4f8fdf2e545414cee504d6e295f",
+                        "s" : "0x6a374477728ff1dc5bf840abd90d5836b30c3243e694076ce9eda986965f9de0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1134g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1134g0v0Filler.json
new file mode 100644
index 000000000..5aa934a99
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1134g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1134g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61046e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x31782d411a367a3fa8d884f159857535e269121a28d0124d93063c18e4462394",
+                        "s" : "0x0eb60ed691e7630232a0a73fe6cfb2548f8c6cb1c9143030e3abd320cce39369",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1135g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1135g0v0Filler.json
new file mode 100644
index 000000000..2e57fdc83
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1135g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1135g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61046f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcada98efceaff4b8c1f5e953e73ae559a93370e2a83bef1016b552bfe68c88eb",
+                        "s" : "0x13b8f503269ad95142a72f502c8b879ee5192622d6eb3ff424c9a77f4ebf41fd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1136g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1136g0v0Filler.json
new file mode 100644
index 000000000..9f5fb7f29
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1136g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1136g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104706064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1ca26f451ce020054e236041d7f17131d3c133f7a7bd139437298466f1babeed",
+                        "s" : "0x6426861eab778c59e19f277c6f2452402d02d0cf88cd0a5c9c303d87af5fc075",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1137g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1137g0v0Filler.json
new file mode 100644
index 000000000..b3d8d4add
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1137g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1137g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104716064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcf4c2f11011a08c1f6118796dc067bcd75bf9d52bcbbfc6e13a3699ed2b03856",
+                        "s" : "0x2053661bbc3ab885859f9edce0c82f0efeececef593aab5c19bbaccd9d61278f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1138g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1138g0v0Filler.json
new file mode 100644
index 000000000..ece035d93
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1138g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1138g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104726064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe968c0c0d3f5d15b13e32c7faee495a92ae6e08d8ed297390daaff0d12d4be8d",
+                        "s" : "0x3e71cf4ad08de9d385711b75cd0b772b23429f134754f2900831ca1543c71c6a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1139g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1139g0v0Filler.json
new file mode 100644
index 000000000..0f058c884
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1139g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1139g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104736064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd10a47e337d2c98c3d66d90aafcc3853a883113a19ccd7605766bd5605682b16",
+                        "s" : "0x209912cb3c210c257b56207b6ff7edaf7c95e321667d41cb3488aeaffffc63d2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d113g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d113g0v0Filler.json
new file mode 100644
index 000000000..781c55d4a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d113g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d113g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60716064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x086d4cad937d194676ff10c9c2436c919053fa1151d0735f17ecfd94d2c2ffc0",
+                        "s" : "0x4b4c82c47f1a7038b122ee530545293bf98e394b9354eac074fd2d29c9041532",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1140g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1140g0v0Filler.json
new file mode 100644
index 000000000..8fbb7d8c9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1140g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1140g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104746064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcb11fe5783a09ff0fff3043ce81e7c9e1b05eb9104c6d162ffda38c2f79ccaa8",
+                        "s" : "0x27534f7dba0ae73ffe4b100d811ac9614c8d3f227f48bc5a5e02293a021b4e56",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1141g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1141g0v0Filler.json
new file mode 100644
index 000000000..ea53531d0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1141g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1141g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104756064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1364ae1f05391f245934462f3a77e1dc3fd0bd9a73612a9faa1fb67b4d472888",
+                        "s" : "0x25f00ded3544aa5b4e556f31614ce0524027763ef1dd897904530a9807c505b6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1142g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1142g0v0Filler.json
new file mode 100644
index 000000000..a65a7c154
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1142g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1142g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104766064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x257ff069577648e3602a35664c007b97a2b71494ff7f2571bee3eb0bdb0811ff",
+                        "s" : "0x6a0e455a334c808606d30c6d53d516e950bf36f0291973305deade62aa23d2b4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1143g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1143g0v0Filler.json
new file mode 100644
index 000000000..183b18dc9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1143g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1143g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104776064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5d15d550707c0ebfdfca6630614fa1f3f5f07d7084112a0b23b143bbf97d5bbd",
+                        "s" : "0x6d8a040b07f5541a77df6e13e6f5cd3d00268fa23fcf57e7b0e5c37951b613ad",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1144g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1144g0v0Filler.json
new file mode 100644
index 000000000..89125528e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1144g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1144g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104786064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x83e3dc9cf476bd7c3a4e7963f82477ccfc3840742920783d99f38b9fb3b2f144",
+                        "s" : "0x497d9521ba37a0ed5ce25026053a78d3b9710507652f97d8046961232e2dc6d5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1145g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1145g0v0Filler.json
new file mode 100644
index 000000000..ad5a31b4c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1145g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1145g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104796064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8de0d4fa447c1deab98a612c44d64cd984507cf36ed20132659841f1fc030b6e",
+                        "s" : "0x6f3abb00feb69e759d5d8967d21b2531b0ece14b283b90838235b020e4a281e2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1146g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1146g0v0Filler.json
new file mode 100644
index 000000000..d2ed89402
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1146g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1146g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61047a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x838d298d09be558dc0b0b08d44c279946ee67c688a1988745beee10c1b57960e",
+                        "s" : "0x0ff4ea5fab03b5afccdc12606285527bb34b3d7a21755d7f068b1391bf1fcdd1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1147g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1147g0v0Filler.json
new file mode 100644
index 000000000..d3bd8f59c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1147g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1147g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61047b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x56f355ec15683bbdf6ce51186301d8218847ac59d7f0005b2ecbef4c5dec51b5",
+                        "s" : "0x1abbbff2ec398e96103e3700eceafc011ca6bd485e1d80ae56c4bf3a73810345",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1148g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1148g0v0Filler.json
new file mode 100644
index 000000000..b587dd9e6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1148g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1148g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61047c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x03aa3e30f56940debeda75af297bb983297ef0e970d9acb24272ff0dc323978a",
+                        "s" : "0x573cb317b4b28e941c07fcd6de6a8df78e8e5055d0fb861fc636a111aa8f570e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1149g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1149g0v0Filler.json
new file mode 100644
index 000000000..fcd12679b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1149g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1149g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61047d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5310615f9ad64e8d7d0f0ccf3468b0a866c9c09cf6c05fe2d086ae6c0c204c30",
+                        "s" : "0x235c0e30582b37757e74b9b077ca7d901bb18e3a9fa622b5ea71c21da1ca31e7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d114g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d114g0v0Filler.json
new file mode 100644
index 000000000..369fefc6a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d114g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d114g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60726064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb3431e2335a52578f25238b8d9e0cd97269dbe7efbca1cfdd9141c34d79bd760",
+                        "s" : "0x24385cf06cfcca09427393f24d09c9346b5fb37abd9ba0da14280c8dd3ccc735",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1150g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1150g0v0Filler.json
new file mode 100644
index 000000000..5c446fd23
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1150g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1150g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61047e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x17df9eba4004bea0a2eb849ffb920a1f83014ddd2f9adacbc0a14778126b428a",
+                        "s" : "0x6c4901eedc89389a3bee7482e919a86df7141ae5771074e9d462a13d072a69de",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1151g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1151g0v0Filler.json
new file mode 100644
index 000000000..cff6c784c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1151g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1151g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61047f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0caeef8d70325a25152e6ed2728719138768bc07002a86460c10040448aa2bcc",
+                        "s" : "0x08cde107a70f7f14d90d10c689471d68f16170510a43d4286a81929165c5bfd7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1152g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1152g0v0Filler.json
new file mode 100644
index 000000000..16c255f47
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1152g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1152g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104806064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa23a42cc0815d1344a4e5e82d8aa535bb4251f86de873f81e4ca6ee7a405ac3d",
+                        "s" : "0x06df2e566efd02fd12d22e4a4b57f0bf75a01b75add921686b9278092f0a755b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1153g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1153g0v0Filler.json
new file mode 100644
index 000000000..48ea5b956
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1153g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1153g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610481606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x56825e4f0b9fed2597149d8500e3975fdad08f9907f5dc6f98f1d8da78abf07e",
+                        "s" : "0x36d47835848c05b8b180b3a9ddf46ead63ee8afd5450c9cac14b2e8f785a2cf6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1154g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1154g0v0Filler.json
new file mode 100644
index 000000000..7c8f31309
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1154g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1154g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610482606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x112380f71965fdf216444bc4ea17c6f745322c99ae51e2dbadbd60f583670a79",
+                        "s" : "0x7d6caffda404124883fc3d140539c1f1634166c038709b89bdde1cde0badf566",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1155g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1155g0v0Filler.json
new file mode 100644
index 000000000..788ee8d9d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1155g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1155g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610483606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x142bfea08800a7ae6cde584a3967679da553b1e8a984b12123ffadbc13689fdb",
+                        "s" : "0x382ed1f61cc005dafed222c3862009140b44676163346f0cb65bffcee465848c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1156g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1156g0v0Filler.json
new file mode 100644
index 000000000..738b593f8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1156g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1156g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610484606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xac6daa76c614378849048656915b4d0733b84d3836ffb9fe8ae1cebaace66945",
+                        "s" : "0x50e9f414891856f62bde6688939c5c45be950a3fe3ddb4167e76c82b84a9166b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1157g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1157g0v0Filler.json
new file mode 100644
index 000000000..adee62a44
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1157g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1157g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610485606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9ed7ab7df417acba52aef1fb73d85220f3d6a93086570633bba360a6754cc271",
+                        "s" : "0x74fc181d35b3c7d1480050f2406ed6e7670ef56c435f18f26100b3987f5bfae8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1158g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1158g0v0Filler.json
new file mode 100644
index 000000000..9ae868608
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1158g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1158g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610486606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x836787abafd230bb4851c33b7248f6570445d50be2fc81a49ab6851c3ac874b5",
+                        "s" : "0x3996bfd089ca76b6947b932ec5252c686f75243ea7318c6cca42d4e23f096a02",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1159g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1159g0v0Filler.json
new file mode 100644
index 000000000..f035d7eb6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1159g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1159g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610487606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe6dae633486e7b2458293fa2609f69cce7d9eea8b78d903f6b627f7255d17b8f",
+                        "s" : "0x69f2637c6b171ee9b967cab6d9d54d311737cde076e349150b151ffba66c4ba6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d115g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d115g0v0Filler.json
new file mode 100644
index 000000000..ccde8b066
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d115g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d115g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60736064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3456700bc1a98bce006dee722a270c8f0e24f015730b359c508a19fbc7ccb57c",
+                        "s" : "0x139a067a8158ea4c2828d9fefc84ee2c6f40f66ee7c55799a271e9289dccd141",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1160g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1160g0v0Filler.json
new file mode 100644
index 000000000..92c612d81
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1160g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1160g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610488606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa70a24abfe30c9fc993494d8c8ae923720147fbeb954b6f34d4be26c0443b471",
+                        "s" : "0x1061125f75d65b5681dab4ca56c0730805f0c759adeffa5eef24ec46c2d80edf",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1161g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1161g0v0Filler.json
new file mode 100644
index 000000000..bb41c7e84
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1161g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1161g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610489606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe0230492a2f50ebf25c0c12d36ed5149677212f6d7bbbd0db818f9d39e050de9",
+                        "s" : "0x201f5943c27f74c0490358e500fd2856120fa2d3d53cdb34a5435f6553d3e788",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1162g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1162g0v0Filler.json
new file mode 100644
index 000000000..24d02273e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1162g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1162g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61048a606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0431326abda298ffb3a3ee7b8b2f40998918f2d1af6a28493e8c85a950578c4b",
+                        "s" : "0x6b39d97d0ba211ef49c6bff627dc51c15ed8c0a7506b9e7b6a6cd2295c0dcd70",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1163g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1163g0v0Filler.json
new file mode 100644
index 000000000..4ce776d3f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1163g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1163g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61048b606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x78fefb85e7a552b1e95c77fb661833c4c52b826b37b32687ebd68f435fd3c9b6",
+                        "s" : "0x6c6b84a1d0082185f03c2951dde4f299f8d61eda7e086b6e5a65e9e2c3cf3074",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1164g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1164g0v0Filler.json
new file mode 100644
index 000000000..8ff021827
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1164g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1164g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61048c606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd64fd7f6b193c1e4014428a97100e5624daab402a31195204922482b1089a16f",
+                        "s" : "0x29051095754934626aa5470538dd33645f19ce23f9a3e19529090a73f9c08ecb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1165g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1165g0v0Filler.json
new file mode 100644
index 000000000..4a998f2c7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1165g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1165g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61048d606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0376ce58d66a285ccfda4b1745c661759d1d0fe7a1ef668a8fd37d0edef1d291",
+                        "s" : "0x361151ae5f09fae1c0eae3159da1c5c1c19f04f5a79fe83f4963a6921eead767",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1166g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1166g0v0Filler.json
new file mode 100644
index 000000000..000491877
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1166g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1166g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61048e606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x78a5f5066f059973bb24c2ce0f885dab877ab52b652b6482a470c5aa9909eb1e",
+                        "s" : "0x51ecd5b09b81791fd455324a49eb902292bea78b5340e70fe3a40dc8d33c5de5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1167g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1167g0v0Filler.json
new file mode 100644
index 000000000..1fd280c1c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1167g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1167g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61048f606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x55fa14ef2bc9856e96b19557625960f100a61ffbc8113aabc5b64a5fb629015c",
+                        "s" : "0x5cc62558164b084f0dc25008042c9fdb10a048ea2adfd2e962bd37cfbea18f51",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1168g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1168g0v0Filler.json
new file mode 100644
index 000000000..8fa368fd5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1168g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1168g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610490606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa9da55becf28e37f3618c341e1de7cca51c035a564457d16583a0aa10e121d1c",
+                        "s" : "0x123e32f72e99d8c1aaff5e5463fcc413ee881b1c07c49f7586b74f0bc7e8da91",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1169g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1169g0v0Filler.json
new file mode 100644
index 000000000..9d46fd317
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1169g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1169g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610491606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x973adb358db41535b60fe90bbb8fd29297cb5e16246faeb32e2e9d2ef7ac8df9",
+                        "s" : "0x453caba0c7b5d2aba2c6dc34062f1ccf8154d7a0d5b2e2ed004206bd82beec2e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d116g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d116g0v0Filler.json
new file mode 100644
index 000000000..6bb1fc189
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d116g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d116g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60746064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4b866007eb1c45afda1c6826ed0540c2563f711e5af4727edda3731d97eb6845",
+                        "s" : "0x1930178178f9be16e7efb087a794c7af8ea025b3b2786b18e027b7e354d35872",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1170g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1170g0v0Filler.json
new file mode 100644
index 000000000..4d7dfc0cb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1170g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1170g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610492606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf09186a884d092bca1c508e80ae68dd328a496c3257b4ce842ba637d41f234de",
+                        "s" : "0x5bfec2d5a641cc6a9f8815e2987276532687f31c7d16c36971704c21fb95bb9e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1171g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1171g0v0Filler.json
new file mode 100644
index 000000000..18678f77f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1171g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1171g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610493606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc46ccba6e0bb6c15f92cac379fd5c23f7cdde031a6b41b6f8d7573a909dbe1c5",
+                        "s" : "0x3e3d6c3c0d9d8ea710d412c7c5bfdebf0a93f3922d4081924a9ed637cb80425f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1172g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1172g0v0Filler.json
new file mode 100644
index 000000000..d2edc8b3e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1172g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1172g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610494606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe31fcbc0832f1d01bbbf3b07e55a1f094b0176605d0bce9c8c6a7d1ca4d3d446",
+                        "s" : "0x041553ed59845c41e6a34df550e970360cd8a12ce3aa8ba6f75b434e2e8d0236",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1173g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1173g0v0Filler.json
new file mode 100644
index 000000000..c1651fa18
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1173g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1173g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610495606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x75c3c8f97bf7250d1d37a5eb7cda52bb87f8dda4ed65e9a9e93cd2cdf04d1e45",
+                        "s" : "0x1df63a5c65dd9895b959e4503507917e86e84bbe34edd230afe9f71858243f53",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1174g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1174g0v0Filler.json
new file mode 100644
index 000000000..a2553a12a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1174g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1174g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610496606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5107b74d8bc8239f91bd9527d27c41406a4e0fba02f1b7c97fcb8e1af829a84c",
+                        "s" : "0x45337ecd1396aaf5b2f60c5b400250f34607bcda36ed9d486c7490d5523a6aac",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1175g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1175g0v0Filler.json
new file mode 100644
index 000000000..5c908f946
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1175g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1175g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610497606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7486721a89f4a5f884857ba37c8910de60c81e89f8ba73e1a87019f4945ed400",
+                        "s" : "0x4801ddd16b8efaff2f0638644781621b2d63c8c405e45128d6494d66a2344f8e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1176g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1176g0v0Filler.json
new file mode 100644
index 000000000..3a49d21ee
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1176g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1176g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610498606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd21204ca2657ffdbf2352cc8896de6d17256ffc16445e2b8db020124867aa2d4",
+                        "s" : "0x68ac8f39ffdd4370b267e30e0310b66cdd3103ee76712d8a60c439fd15fe0eb5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1177g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1177g0v0Filler.json
new file mode 100644
index 000000000..1c13490ec
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1177g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1177g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610499606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcb9a864073058805324999d070cfb67064dc772998bf617da7f3ba01aea246a3",
+                        "s" : "0x5e2da99e5c33a1b1de523d249c47d668b1e620be428eae896834529d7bfc6cac",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1178g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1178g0v0Filler.json
new file mode 100644
index 000000000..36b399623
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1178g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1178g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61049a606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaaf4a53857fbabcec8ae0223fc179f653bec1f54b77c9694c5b9247b061cc37d",
+                        "s" : "0x2f1bb30fc5dc72d848d56a0fd214696a141de5b42d875e4b425949a63872749f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1179g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1179g0v0Filler.json
new file mode 100644
index 000000000..c6f3c6905
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1179g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1179g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61049b606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa4c1153114f2ad1fcc207cf932c83af6f689374fb8a3af39547848d1cb21a3f6",
+                        "s" : "0x3b385645130bd6450a33801f2f4b8f627c17e5862616fd2ea2541898ba764b6c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d117g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d117g0v0Filler.json
new file mode 100644
index 000000000..d27f526e7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d117g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d117g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60756064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x751e8b75380755608bf95981bb1b6cbda160acca7d0359ab6cc8e22e9749ff16",
+                        "s" : "0x2423b0b4535e7ca35d5d7e591b4fa4f5b19c67809eebfb86fbbba7d072dc9553",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1180g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1180g0v0Filler.json
new file mode 100644
index 000000000..44d5e4fbb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1180g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1180g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61049c606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x06bbbb1c47298c2a28f83087e5dc785de4375875b5ce59a662153bb212a5c5d2",
+                        "s" : "0x568e6a04401b1e113acaf888e52dbc1647f50a0f9b6bacb3a0e5799a71f86f2f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1181g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1181g0v0Filler.json
new file mode 100644
index 000000000..e569f3719
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1181g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1181g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61049d606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x76719f3897086b2e74a5fe4aa59b246b80bc4031b757a3c9c1793b08d5ad8c3d",
+                        "s" : "0x2cdbfaf05c57c150efb0cf3fc2dbd9b5f5b28820f3df4132c13d2cb83ac07b2c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1182g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1182g0v0Filler.json
new file mode 100644
index 000000000..b2b5c4fe6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1182g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1182g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61049e606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x75099e3e21f4db6c81ddc26286fb48fd9ff89daf730ff391a10650b4937e2c79",
+                        "s" : "0x1710b0d79ed84a6f3d47db8bab34c06ddea4bf60e827af48a1fe001d9a06fd39",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1183g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1183g0v0Filler.json
new file mode 100644
index 000000000..88e8fe9fe
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1183g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1183g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61049f606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x28b3823e3688c229824a81b8c8caa1c07e4730e10c6757e3bb583429a1d93b7e",
+                        "s" : "0x17657e8764e711c2c38541ec17134cc9764ab234c69ff8ca07b6072e4e3e74a5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1184g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1184g0v0Filler.json
new file mode 100644
index 000000000..b9c65c635
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1184g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1184g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104a0606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x739a54d4cfeec6f1beae01fb0e540ecf3acf2119953c94021283cc44e3ceade9",
+                        "s" : "0x5ceaeb49219d20af986b1a5d4275c0b793884e463f3e6425a47519ae9cb8c3e5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1185g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1185g0v0Filler.json
new file mode 100644
index 000000000..55ad81b58
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1185g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1185g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104a1606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0f3a0c30d9f714ddab6807b955fb0731405cebe7c2371a246871f8e3bddc9fa7",
+                        "s" : "0x6cf4f5ebe39f29020e38ba8fb145e1c739604535648c6f4a12b3e2904ee85371",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1186g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1186g0v0Filler.json
new file mode 100644
index 000000000..c1cb40b14
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1186g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1186g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104a2606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xac98f93dd38b6198dc9b0ffd5aca9c94e0e9ad304c9156f7b6b9034e9a8fc6ae",
+                        "s" : "0x465da818abe86a6372497781a4fbcc60be88f8b8faecd85d2d36c885abc1ffbb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1187g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1187g0v0Filler.json
new file mode 100644
index 000000000..b75d31811
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1187g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1187g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104a3606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5cdf6249f9115940187661b4eb1e1d1fce97fd9452751387c4c9614063ac35dd",
+                        "s" : "0x533e8ad0dcf008963169e90ce73064a8bc937d0c190a407dfcf88601c5c51fa3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1188g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1188g0v0Filler.json
new file mode 100644
index 000000000..88c87d647
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1188g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1188g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104a4606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x78b68f171b6887e17131582acb09559f93910496b3d8b5c2859a9ec0c1acf898",
+                        "s" : "0x1bf95bc67e97f252f18eb32d6d12edf05a3f90406a3a8e7ba2f44542e0ae1ba5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1189g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1189g0v0Filler.json
new file mode 100644
index 000000000..0739fd9f6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1189g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1189g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104a5606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5e4221d767e0f185bb84d88f9249253348d176bb5bcbea84b36b707da864b423",
+                        "s" : "0x5771f6b6439e5619b9c5f2da5bda8aeec96ca01b1195731e206a5ee00dbfe416",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d118g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d118g0v0Filler.json
new file mode 100644
index 000000000..7981a6dfd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d118g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d118g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60766064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x83259df8873bb38ccdfbded67e65f5cbfd3aa47f68b161aa6f3033817c7cac51",
+                        "s" : "0x0d43deeaa52b1863f8336a23fa291b78d5ab893bf8a52fbc4ce6015d4188c2c7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1190g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1190g0v0Filler.json
new file mode 100644
index 000000000..e15a617ae
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1190g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1190g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104a6606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa9ac3d6574bc85f4dbebb6a30f268f4158d4179aa83a737ecf981aff3fcfdb31",
+                        "s" : "0x58f4827ae7e0f141b327c494aded0a8124f866a2c4cea9f0c0d3eaa91176c391",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1191g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1191g0v0Filler.json
new file mode 100644
index 000000000..7f79bc217
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1191g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1191g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104a7606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x883c8ebf2e81c0e14a96992a77d92c62fb4a5f0c910efb1d35b9e07002de5a78",
+                        "s" : "0x57a47ac4f6dc3655a04d4243f43b0f0e3cef7b187d05cdc57ca3428d4a26dc57",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1192g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1192g0v0Filler.json
new file mode 100644
index 000000000..d9a177a39
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1192g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1192g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104a8606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x351c1d74f500455579ba421c007ada301db85d6738d614bbdf4a0b71be61e4cf",
+                        "s" : "0x67397ff94b702bf7c85fddecd2275e0cc1b955092ac00c3bf28c78546b6c8842",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1193g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1193g0v0Filler.json
new file mode 100644
index 000000000..09c79085a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1193g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1193g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104a9606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x26621b7d68809616b090cd5a8367b0a826fed2e1caf495d1403a15732183da40",
+                        "s" : "0x594d2c27b9083e04bed575240292543399fcf6c0f5d00632380444d669f7acd0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1194g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1194g0v0Filler.json
new file mode 100644
index 000000000..8aaca80ac
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1194g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1194g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104aa606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe03fbbaa7b6673e3f87b9d14615557c9215351f6a9c021dad03184e329679421",
+                        "s" : "0x7a76179c4a0329eb33246fbf9563a5df823093672c6d236ca7fe40e51779faf2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1195g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1195g0v0Filler.json
new file mode 100644
index 000000000..4890d5771
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1195g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1195g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ab606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x49d67f9b58520fbc1595b251026c097e4a4cd8f521d066616c9a6865f2888da5",
+                        "s" : "0x52898886a5d11216ec0fd6eff4ec96afe0f65488ca20d8ea80898da60be4eab6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1196g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1196g0v0Filler.json
new file mode 100644
index 000000000..9786943f2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1196g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1196g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ac606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc724e47aa57f41e8d747ad305ea5870594e708ea7d9e238fe50a54ca902fc2e4",
+                        "s" : "0x226876dac5d4294c3236355460d5308a244b53249a3655a08d8805b8e98fece1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1197g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1197g0v0Filler.json
new file mode 100644
index 000000000..a105d2274
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1197g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1197g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ad606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb4773cf6028cc010f143d37298574d75e5286adf327100e95e6fa52c3bc571cc",
+                        "s" : "0x01783c1ef913d9c1df823aea8bf83ee637f999fdc935162156c42944d7e4c142",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1198g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1198g0v0Filler.json
new file mode 100644
index 000000000..c2c9eb1ff
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1198g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1198g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ae606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe3086bfba191a56864bb41b904cd1c3ffb1ff3aecab4323148eeeb833c179974",
+                        "s" : "0x62a729eab7a00a14d0cb4bd1dfc34ef2425332258c797012f9cf70da25246666",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1199g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1199g0v0Filler.json
new file mode 100644
index 000000000..239a65c72
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1199g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1199g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104af606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x579f126a110e6b6367a9b9980502f6881c4d75bf79f426b6eeed7b8ea19cafb3",
+                        "s" : "0x245b933e2e63332a45c2d0aacc48be48b12d184066143e1fe65570954ea0aad8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d119g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d119g0v0Filler.json
new file mode 100644
index 000000000..2c4815a8e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d119g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d119g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60776064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5897918a5a031665526f27e7ca1f8994d3772b23118ca90a8ad79a2a86171af8",
+                        "s" : "0x183d3266cde9b8b9ed7531bf19bd1c90b7048c332960976de7cb2a027dc89b5c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d11g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d11g0v0Filler.json
new file mode 100644
index 000000000..96546df00
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d11g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d11g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x600b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb0b746fe5491d8a0711f0bc38e34d8b2992396ae46cfb99baee4160decc1c2cf",
+                        "s" : "0x019d32175e29aade2e63f2429b3eda8aeb2348a82a29d8a7b169281aa6403ac8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1200g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1200g0v0Filler.json
new file mode 100644
index 000000000..a6e5b458e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1200g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1200g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104b0606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2c0418e07f68648f8c4a4f7927de2047e70ff4ae92ed4118c1134920b3e6affb",
+                        "s" : "0x3ad9fca0cae5d188a4c75b611572f50e0057011c7c61a894fa7a499d1d7ab8a5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1201g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1201g0v0Filler.json
new file mode 100644
index 000000000..bf8e4df59
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1201g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1201g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104b1606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcba1f086ed243c6a062c77776c734789ba4912f7ead5e3298924f63d75ccfffd",
+                        "s" : "0x70857112793cdb5b5fc3528b85894bf7148ab7b6f9878281753470271b7d859e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1202g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1202g0v0Filler.json
new file mode 100644
index 000000000..387e5627c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1202g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1202g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104b2606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6aac2d254f4dfb8e025c605a87c9d94964ede0675637b843c5e2d53bc610ec3c",
+                        "s" : "0x54e1b1a3d9c0ac459540fe2f6291338a9965e64caf0903b782f1df479b61b1c9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1203g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1203g0v0Filler.json
new file mode 100644
index 000000000..ad154d124
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1203g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1203g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104b3606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x20f7295b8fec7dc71c54262e66f62b128c1cda560aab06427428a1522defbc85",
+                        "s" : "0x2a3e593736c5feb44c5c5867f89b68298d5ac906ee760a272521e1c843ca804b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1204g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1204g0v0Filler.json
new file mode 100644
index 000000000..e98bd3880
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1204g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1204g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104b4606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3dc6bff520ad8982ad38a5f4aaedd9e98be7ca31f07dc216ace541e045f45275",
+                        "s" : "0x43c090f503a9781dd3fe7bc1eaa406618bf77464607812adc3ef11685d84c7e0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1205g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1205g0v0Filler.json
new file mode 100644
index 000000000..6f50be6be
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1205g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1205g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104b5606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x66e20d3399d37a9b8f81643b18f59b0b7eb650fe45289df9dc1640afed9830cd",
+                        "s" : "0x0b6300f52f95bef1008478d92817fcc7e9832771d8d96bee4b609af451403262",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1206g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1206g0v0Filler.json
new file mode 100644
index 000000000..2f6505f22
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1206g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1206g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104b6606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3568fb05845a609c3288785792e64380e9951f7a7975afa2464394079e04800f",
+                        "s" : "0x775274e715080613ee0764144b22b5cf993dfa0cb86664b346dc3d6f955063c1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1207g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1207g0v0Filler.json
new file mode 100644
index 000000000..ff38441e1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1207g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1207g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104b7606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf41b32de6c8c9465d9ad4694fd04df0e4ef1444c50572d3649bc1af1e5e860e2",
+                        "s" : "0x3ef45b65610b1209d32a08baeee4f5f03b522dfad7d7fb8f9804b99e6f53b772",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1208g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1208g0v0Filler.json
new file mode 100644
index 000000000..4f2acbff8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1208g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1208g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104b8606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3768f8840f138393fd9fa570f5652d5e0dd64e81d9f0991fda3306c1ec6fa15b",
+                        "s" : "0x048ecd89b2c5bd85399bed8c07466845dc922bc46cf5cb628d75184bca026780",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1209g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1209g0v0Filler.json
new file mode 100644
index 000000000..05a12b0c7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1209g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1209g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104b9606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x713bbb93e165e2ac5bb4ea4f1d16c8dfb21719ad13574c8b764e87142ea50c9f",
+                        "s" : "0x7a3be85eab894e86cf362926c68a45c8ca5991258310e0f5d89098c059ffb7a1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d120g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d120g0v0Filler.json
new file mode 100644
index 000000000..ed65665ab
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d120g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d120g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60786064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x89b0b76aa364312251b3603b022d9c23a697908ef77164515d7304a744402175",
+                        "s" : "0x4e49acd2bdb4bf9d748913c8acbb4e8724c4856c8675d494f3b187d4df921b46",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1210g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1210g0v0Filler.json
new file mode 100644
index 000000000..9a0975158
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1210g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1210g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ba606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc7f62b271f9876ba5f6ee7e643dd87b474e8bd18b76f25e6eccf57c5778fb799",
+                        "s" : "0x5a4c03f7069fc75e12b86b7751626506295b0287d29b384b5e1846b50d7cf493",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1211g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1211g0v0Filler.json
new file mode 100644
index 000000000..e8dd62e01
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1211g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1211g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104bb606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8a738c8719a29c23fbb299d11d91ffb00683859bb95e725c5711988b40132ea6",
+                        "s" : "0x047ba5e6ed5cc532deb557ac561ab6488dcde9204b234e2a9da38190913e7074",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1212g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1212g0v0Filler.json
new file mode 100644
index 000000000..f4f1b9f64
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1212g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1212g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104bc606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x950d476feb54707df3cc673587e020338937ca3e875bfca0af961733e6b94f15",
+                        "s" : "0x56cfcb2cbadd43c8f1f2641c035c3e4a68e2c7da8d464dc65266eed96e52175d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1213g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1213g0v0Filler.json
new file mode 100644
index 000000000..1332be2cf
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1213g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1213g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104bd606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x30c94e0a70a82680528a6d9eda85a4b5981cc8548587b640123aa7150656b95f",
+                        "s" : "0x53fe3989fe99ae75f7cd4de1b50abe6cc3e3b3e439c4c953d4b8d00e0fffb49d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1214g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1214g0v0Filler.json
new file mode 100644
index 000000000..0b0412e15
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1214g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1214g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104be606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf9a8022ab69763df48c6035c2c445aea4a35770aa3ac3aa311d933e287b680e7",
+                        "s" : "0x4c0cde3752b979dd1fbb8d64092ba0537bb7ecbec4d78e7786990ad125d3e52e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1215g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1215g0v0Filler.json
new file mode 100644
index 000000000..2516def26
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1215g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1215g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104bf606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x475730bd8f45f33bc47899956c9a7e90a3cd9366db3b18d0703fbed1c7c901ed",
+                        "s" : "0x4b4addb491243527fb3f3014691b4e8b0f83d1153fe40d4d997df3709dbf6b09",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1216g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1216g0v0Filler.json
new file mode 100644
index 000000000..0c0e54358
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1216g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1216g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104c0606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x42b15c7d22746b2400bfe199c2669dcd9bf42ac8de9f123f0b0a23b09f43e4e2",
+                        "s" : "0x70e1040b01a62d82e0561435a21c82a63697f04263eda1923a0e8b49bfca637c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1217g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1217g0v0Filler.json
new file mode 100644
index 000000000..2a15e1bab
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1217g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1217g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104c1606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe4b94a8e37a5b5691d7b14becc28bd33389b61efddeffb1a073838d019d5ba94",
+                        "s" : "0x1083156105a3c469ecfeaf3f79d9969eeca767c5627d01f992f4db3bd88a7f04",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1218g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1218g0v0Filler.json
new file mode 100644
index 000000000..46cd6d452
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1218g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1218g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104c2606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x87450fec16640cb36a347dbaa38b253d2f3ac8ddf2cf3ebf26c05fb284f33c31",
+                        "s" : "0x2dd49730c40b2997a0d82a5ce4ea19b85934492cede733eaa219db9e01358636",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1219g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1219g0v0Filler.json
new file mode 100644
index 000000000..6bebaf3a1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1219g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1219g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104c3606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x516edbd1999a12b09b340402f97b9dd86ff6991a37bceac7f66c819908121f45",
+                        "s" : "0x1d18bcd8d3f02f540174c7a94ac218f136743a6a507516a76c400d7e66162287",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d121g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d121g0v0Filler.json
new file mode 100644
index 000000000..53d6a06f1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d121g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d121g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60796064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x513c1f9d4c24992d7e9863b937f143468dcfd36b8454ba11211fc5a3259f31de",
+                        "s" : "0x4c49f0c89add48b8b34944db2ccdda7a80ad677b09ba3b274f8d19adf9d9b76d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1220g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1220g0v0Filler.json
new file mode 100644
index 000000000..e6c6d5205
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1220g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1220g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104c4606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeca710db37bfd662a0a42d7c3ff4b2d2a6b68d13b63b67cf4a56e871379936bc",
+                        "s" : "0x11bf43451176e686290889811674dcbbf34522eec4e0464733d04e985cfabe7b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1221g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1221g0v0Filler.json
new file mode 100644
index 000000000..30b3b5f5d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1221g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1221g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104c5606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x096069e3b24f1fa681de2e85a4ce232105dc184f79afef5681b138c451b7c139",
+                        "s" : "0x51f2be9c148840c90cd4379c6bb912f86a0955cf07213f776325550a97f947bd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1222g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1222g0v0Filler.json
new file mode 100644
index 000000000..259c0ea42
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1222g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1222g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104c6606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x776b3dce9df9dbb7342ebfb8fdadece4a9eb040a2aefe28da7e7ab69bc34b91d",
+                        "s" : "0x6ef494ed8106a6d820ff60d26dea389f9af22a7a528ee759918d2d45870d88d3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1223g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1223g0v0Filler.json
new file mode 100644
index 000000000..53087aeef
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1223g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1223g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104c7606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x251a5619a66bf552df69498b67c68d91ec51ff27a14842ff678f3468e702eeaf",
+                        "s" : "0x6242ab67858d1b5a9bab5bf964c7a92fb3bd527b0ff84e1023ade3c6ca25155a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1224g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1224g0v0Filler.json
new file mode 100644
index 000000000..a563d515b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1224g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1224g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104c8606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8f38fa37b7b440956b78f42d30a993b6955140f17af0fa455a8ea6ec4bb56305",
+                        "s" : "0x4a79c781adf847cdd4144673071cb67c47b643940469a88bff84d1a093f67f80",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1225g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1225g0v0Filler.json
new file mode 100644
index 000000000..d4a90fc2f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1225g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1225g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104c9606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc4cfd7da2b533ac9a4d29786622df8ca26c43607b5498a336ddecd15ec00cf3e",
+                        "s" : "0x58065b48b4c8d38fd9c82f968d2daba76c9fce1cfc123adc61448a59f1286cdb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1226g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1226g0v0Filler.json
new file mode 100644
index 000000000..96acf0341
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1226g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1226g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ca606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd3b42c2a009b92a397d878d85dd295af8b30c47b2dba698d98569fb909537796",
+                        "s" : "0x6c3d4e2a4dbba8873d05734c5cc8ba178df64dccd2b334bdfb7c828666674566",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1227g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1227g0v0Filler.json
new file mode 100644
index 000000000..a7bdc14ec
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1227g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1227g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104cb606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd9825c2af03b991e86ca4e6f5a4df68256fdb3ddb53be593f2e1330ef9e68c9f",
+                        "s" : "0x374e414785f0cdde2a79652c712db7d571e91218e7a7c2dfc311c78d841a9e4a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1228g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1228g0v0Filler.json
new file mode 100644
index 000000000..224d841cb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1228g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1228g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104cc606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc98467c3c136cd4f28d6cf943a27f66efad226d7f952f9e24682b287af50fc32",
+                        "s" : "0x1418a6595cc5c155b42fcb60e908b2e39c42a85306ff8d1e00853ba640accfcb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1229g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1229g0v0Filler.json
new file mode 100644
index 000000000..b6b175ecc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1229g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1229g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104cd606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc519e5544e435793c3b40d9dfe6b087504c2588f7444fb828c9d935f1edfb08c",
+                        "s" : "0x6d334ce3546f7d43ccb6cefa6cb003c0d7ca9733a258a5e8b81244f1b5f65405",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d122g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d122g0v0Filler.json
new file mode 100644
index 000000000..c7d62c955
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d122g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d122g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x607a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe3180d30ab6afb2bbc335e768cf45efad906a40581329a0848abf10430161a1f",
+                        "s" : "0x36517c5450c3cadc81b50ef0039a380d1fee2224cf5129f06e38d1bc6f450adb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1230g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1230g0v0Filler.json
new file mode 100644
index 000000000..f9c8d75a0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1230g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1230g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ce606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd5b33b475df28030c0318086e3a4402bec0593be15718abb476cd60bf2883608",
+                        "s" : "0x5840fb99279d08bd10ff2228f6178870edbfb195411357d0e57d6f3a3531a2e6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1231g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1231g0v0Filler.json
new file mode 100644
index 000000000..367eab24c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1231g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1231g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104cf606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x55e9dfbf713c1a9632fdada6117636eaa0cfba0d13a005d1cc6b33cb9c86c8a6",
+                        "s" : "0x4a7e20644329b4f50cc95f237e5ed6c940d1afdad8aa53bfc879ff7ec327c896",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1232g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1232g0v0Filler.json
new file mode 100644
index 000000000..2aa884776
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1232g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1232g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104d0606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3408ee1c87dee80be6bf1616c675b64fae1f5788c037e8f4d1a945b1d98c48b3",
+                        "s" : "0x532ef38e6630abe46cc321bda745269983280c952ad085e06d52c1e1d5197a0b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1233g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1233g0v0Filler.json
new file mode 100644
index 000000000..e4970a43f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1233g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1233g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104d1606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xee208d1f64d9f2506364750560d2bf5e230309583758de387dad580793b19402",
+                        "s" : "0x1aa8664e5b85150638b34fa927e0bcff188d6e985727dc5b121d7a15bb38ea6e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1234g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1234g0v0Filler.json
new file mode 100644
index 000000000..519a34b3b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1234g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1234g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104d2606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3e99c0030e0e5da3142de1569c8bbe3d9275a98d927d95d0041e5b1540736a7c",
+                        "s" : "0x3f699be949ff6587b96a3bddddd18bed1e9865187e6e2171435555bfbd757fe4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1235g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1235g0v0Filler.json
new file mode 100644
index 000000000..827d38221
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1235g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1235g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104d3606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbfa25ea1791b9f69609c44e56fb875dee932efa03532f88936d4acd8e65b1fce",
+                        "s" : "0x3ab4ceece18b0d32f02780374eb0e1aeddaf9d852696e1cd3d33889aaac558b1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1236g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1236g0v0Filler.json
new file mode 100644
index 000000000..45d1cd0c4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1236g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1236g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104d4606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x218e85180cb344548de9855a19cf8b8d9068f97cebebd59776839754e5f7def9",
+                        "s" : "0x08219bf6b34195df98de35df7c89d18f3c9ffe8f7436ad1d2adc3d537a3b21f1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1237g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1237g0v0Filler.json
new file mode 100644
index 000000000..fbc513208
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1237g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1237g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104d5606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8fdb42677dcd6ae95018fe4657b2b9fb20f2da232beaff85f56adefb544c2890",
+                        "s" : "0x6c37093224a2f330f6c18cf2723cfc743f93fe6da01b2c0008ab8702ed686331",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1238g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1238g0v0Filler.json
new file mode 100644
index 000000000..6ea1f53fc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1238g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1238g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104d6606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb6c3785d7f41562107ec7ef02ef53dcad618cb80cadba403b1a1f76b04dab303",
+                        "s" : "0x4016f566a53889e8d566e0a77698e8ac32cc8faeded7382ae6365635647bf2e2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1239g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1239g0v0Filler.json
new file mode 100644
index 000000000..19998801a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1239g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1239g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104d7606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x027a01550a50b47a311352a658a30fd25f332df4089e84afd780821a281ee133",
+                        "s" : "0x365d4affddf01e33efe221f0718dbfaa6fa9afff1a26d13f2e7316798e266a96",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d123g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d123g0v0Filler.json
new file mode 100644
index 000000000..031a26337
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d123g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d123g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x607b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x59adef46ad3f7f44a5d55d21a230f15e8fbbde6d76b11727ee50d7e5fe690dc4",
+                        "s" : "0x548728a5d3897dc36a4bda99f0394786cff1243c5b5355af584f64346be217",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1240g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1240g0v0Filler.json
new file mode 100644
index 000000000..ead3ddd81
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1240g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1240g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104d8606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x56146cb438188c80363d9c313e488b97258e7ff9b4504c93b40a8c697b819402",
+                        "s" : "0x067234b1c3048c219526f5857d83e287c1bf8fed72b0d023c8b1896e14a145e3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1241g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1241g0v0Filler.json
new file mode 100644
index 000000000..e6cca96e2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1241g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1241g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104d9606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xee8510fd3b42bf338b0dd5c52c50591bfbb61691d35e2ef1db5a5c99fdf651a0",
+                        "s" : "0x3f9fe1ad3da18c4463d945bc9702c693b1d884c51fad31e5e54c9f10123dfa98",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1242g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1242g0v0Filler.json
new file mode 100644
index 000000000..f2c37a0d7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1242g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1242g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104da606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7c8f59ddc4ec6071500b001e7294d47d8ef70d56e82a5531acb54d0f7d6f1038",
+                        "s" : "0x71b5d493f6089839fb516f19fee1fbb68690f176ef98993a8f7c6587330bff8d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1243g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1243g0v0Filler.json
new file mode 100644
index 000000000..3e6c683a4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1243g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1243g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104db606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa4a9ccfd27928612be9408822ecf90517074eddfe365646f50e63ffb7677e3e1",
+                        "s" : "0x46eb86e41b2d16a43c94efafdd8c71649cbff282e3aaba65f4af249f5b5b00ea",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1244g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1244g0v0Filler.json
new file mode 100644
index 000000000..3a1f21a4f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1244g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1244g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104dc606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe174e1ce559fc50b70ad160dc03652304d406b47d217d932cc9cec541ac519dc",
+                        "s" : "0x310e488226c9f9144f822437cb46543b8b3a21d163b25bb87be66052ce03f131",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1245g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1245g0v0Filler.json
new file mode 100644
index 000000000..06a2bbb8b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1245g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1245g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104dd606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbd30333d89c58cf5197a51bf595d0ef87cd37fc71d9482701df5059605287402",
+                        "s" : "0x669c8cfe8c656bcdd40d9a56a0fce7a4605a04622b750e116e22ca9faa7d32bf",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1246g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1246g0v0Filler.json
new file mode 100644
index 000000000..cfb8a87d3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1246g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1246g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104de606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2ab0e486afed9e98913ecb95c72c943c6f4337d36a5ba0d8e913a0ce98c4c884",
+                        "s" : "0x5a29664af776ad5201bd0c8d631e36b282acc7a3e5c07c76bb8c45bf365d2506",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1247g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1247g0v0Filler.json
new file mode 100644
index 000000000..a7430ec5a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1247g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1247g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104df606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7fba3428431b90b0338cfa91e3084ad754222c913f57aa220a5968aa930c5084",
+                        "s" : "0x2b433c22fe1ade16234f5f8aef3a82162af6d7469b42fe6f0c11bcc219058cbe",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1248g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1248g0v0Filler.json
new file mode 100644
index 000000000..1af035e1e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1248g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1248g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104e0606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x224fea13f927b8ba437a2b0dc37c3a632ca60c6056c55c2c6b6018d27f89db5e",
+                        "s" : "0x78ebd4921e67fee1419e465a2fff957a42283a7030b8d80a4edaf0fd830b1d27",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1249g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1249g0v0Filler.json
new file mode 100644
index 000000000..35ea2590a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1249g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1249g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104e1606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8eb7b3b1270e789f96989eea0d724f661cb6432aedbbcc166d0980871a69b142",
+                        "s" : "0x25068b8d93eb3c00686c1d68d6cdad27a695bded7d2cf5b9c0f796d17e588fe9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d124g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d124g0v0Filler.json
new file mode 100644
index 000000000..40f6088a6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d124g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d124g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x607c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe914bf25c75286760372c7bbca76515c9ab1066f8de01baeda8717d1f2dc0c9f",
+                        "s" : "0x2b7eb51dfc63a4b6a4e31cbe68a93337f848c30cc6c340fe170b287fe231cb1d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1250g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1250g0v0Filler.json
new file mode 100644
index 000000000..f7a71c0de
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1250g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1250g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104e2606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0748dd2540d6731a78fa9894d9cfe790de42a560c17c774d7c55039d88ea9cff",
+                        "s" : "0x33690f0aeada996251fc2ca0e1f33366f0f94b5daaac3469e768e4e320186f26",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1251g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1251g0v0Filler.json
new file mode 100644
index 000000000..b7f579892
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1251g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1251g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104e3606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x115cd4c7d2c61dab5fba3903c6717a8db18f78304da714bc2edb039bae3bb02b",
+                        "s" : "0x100167bebd43228c1329fef6363d0ff08e6b7eb14066a80aec3f384b2916676c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1252g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1252g0v0Filler.json
new file mode 100644
index 000000000..3043b3fde
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1252g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1252g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104e4606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbde923b7902543f9a51c9e3f2b7baa7c296458280c62395e6ac86cdfc7752bc7",
+                        "s" : "0x7a65b97c8758469184a370180820ac420a12f744bd1e38ee301b7827fe46abd2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1253g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1253g0v0Filler.json
new file mode 100644
index 000000000..9e0f5c745
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1253g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1253g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104e5606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x16521878868498aac54ad35be90aabb36239152ba9cb22eaae379a988fad732b",
+                        "s" : "0x5527758baf6211adc23318bc6391c2e2571ee720b00e5b40bbc7364d36894af2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1254g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1254g0v0Filler.json
new file mode 100644
index 000000000..b873367b8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1254g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1254g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104e6606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6d84ddb332b5bbd46c5553282f16b137fbd742373dafe1dc2d1b18d6eaddaa27",
+                        "s" : "0x3e2548ec2043cc70544c43f03fe37573811f5eb76d6131709948dbc5267c92e5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1255g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1255g0v0Filler.json
new file mode 100644
index 000000000..aaad47e50
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1255g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1255g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104e7606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x17d863dd4e22f37e3838d9a06f9e7b16f5e5303e8bfe3eb049e9b7de10a49f31",
+                        "s" : "0x1977448ce434422d592d6685b8f9e4bf2f26f78edad099d2e8e44c4d70756d3d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1256g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1256g0v0Filler.json
new file mode 100644
index 000000000..63b1ef3eb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1256g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1256g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104e8606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb1a5ef0de7faa0a2788c6067533e776b77afe212e1ba9a113ae34146d6056691",
+                        "s" : "0x4f5bfb3bf24dad26c34007c0ea4495d07db61d52c22ab4e62f54ace8022c78ed",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1257g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1257g0v0Filler.json
new file mode 100644
index 000000000..daf6cde89
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1257g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1257g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104e9606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcd2ef0428076e7df4de9f03d1ab1f73d7e64a50264d2a348117bbbe380d0734a",
+                        "s" : "0x437aab8b5bcb75ecfdf5ebf3935c2580a8272e9a63d71c6394cf752d121c1eda",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1258g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1258g0v0Filler.json
new file mode 100644
index 000000000..8c186f491
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1258g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1258g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ea606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb2e2e66e1ac0f6068421b996f09df45c778d3d03a384536c261b73603661f52e",
+                        "s" : "0x6787687696064533d0d408c504fe2b8d6c53ef227879e8341b555a489f206c94",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1259g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1259g0v0Filler.json
new file mode 100644
index 000000000..852677fd4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1259g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1259g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104eb606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeb47b88ce5c47cdb0f777f414141ad935b534e45d4936268b4880665a232afaa",
+                        "s" : "0x22609ccbfb21a95bb76e46633f291e91a272aa5356bd7dded00b27acc9d503f0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d125g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d125g0v0Filler.json
new file mode 100644
index 000000000..fcb4c8e7f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d125g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d125g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x607d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x53baf26d761aa14e9e481d276730f8bd6aa7693a1f1bd63868876ad0514a1e83",
+                        "s" : "0x4fbecc95ee5b8544fd066985fc816995c735ff4bff1d9d00a717b125eb9c6cf1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1260g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1260g0v0Filler.json
new file mode 100644
index 000000000..e0c7a4604
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1260g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1260g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ec606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9fb564c561d6d6d73700b061f7f4ee67fe07f0db2c84df981647876de8f96e79",
+                        "s" : "0x256db96389c1411bd5f560d32c3dfa31041771f0f3bf695ad4c8e789bc63b581",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1261g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1261g0v0Filler.json
new file mode 100644
index 000000000..cf8c8318a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1261g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1261g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ed606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x22effca592a188cdbbe49f59be6c6bce663864a8b1e3ef8d0be13320ed77f4a4",
+                        "s" : "0x0c5f1413a473ce6cf79223a50df053922436a6209302e5f2f16d08f00577e6b9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1262g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1262g0v0Filler.json
new file mode 100644
index 000000000..0080a0611
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1262g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1262g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ee606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xafb320b472529e87af0a46ff05e7d97ba000d782f9cb59f5cf51866547cc850c",
+                        "s" : "0x418541d72766f342352b66431605698e5b69baf5da427a386e77e6e29541c997",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1263g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1263g0v0Filler.json
new file mode 100644
index 000000000..c9a381583
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1263g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1263g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ef606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5948c41c0ed9871d82c4fbec0e19ef331f421f7641e328f57864d563b911ca17",
+                        "s" : "0x0b582618131a2803b1feb73c20c1c1cd1392e71b59cc7dadfec849f77d9fdb0c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1264g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1264g0v0Filler.json
new file mode 100644
index 000000000..19bb075b7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1264g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1264g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104f0606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x19937b7ef3d94b9a46a41564cb05977f58706d348d75d948193c14ba005d55a7",
+                        "s" : "0x3e2d13418597e66aae72a044437844b8dce1178e051ac35d99fdaf511e730cc5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1265g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1265g0v0Filler.json
new file mode 100644
index 000000000..022748e95
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1265g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1265g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104f1606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x409d83c60e52f1dc4629f530cd4a94d3bb77edd5cdfc8a15202e850f613d2cc6",
+                        "s" : "0x5a4cb8a72ef940a0888bcad4190788a2c0e7f32231d6808c7d884b8221f00430",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1266g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1266g0v0Filler.json
new file mode 100644
index 000000000..1cdbafc66
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1266g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1266g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104f2606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x854b377e324c8f8bb2f9d6c45c46e13d6906d95a773d731eb3913ce385c20c42",
+                        "s" : "0x451122b27bbcea5b02d5f6ac82bc46eaf53916ab94a517e48d0d839bcf3ad5ed",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1267g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1267g0v0Filler.json
new file mode 100644
index 000000000..ff91d9edb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1267g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1267g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104f3606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3b18cd86c879802fc1d4f8c7170cbc06b116eb9fc157b7b625e48ddfed165edd",
+                        "s" : "0x571f3a6bd87bbbb5e9a542957f14dba884fdd8b39173824e92b565c932e6bf33",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1268g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1268g0v0Filler.json
new file mode 100644
index 000000000..f8358f3d8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1268g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1268g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104f4606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf1af363ef29ae3e739d1f95afb29711226683a4a599dd0aef32357511b90f052",
+                        "s" : "0x18728e26d7bfec47a880391be199fc5705b7776b4f9820e53e13eee36ce5076e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1269g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1269g0v0Filler.json
new file mode 100644
index 000000000..93b458e43
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1269g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1269g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104f5606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeb5000115eb00b85705a90fd142d9bc155d944dce37661bcfc1cced55bb60e84",
+                        "s" : "0x01a4186cfe9b1406a4d31bfb728af26af7d2111f8c90edf86ce1b2472590780e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d126g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d126g0v0Filler.json
new file mode 100644
index 000000000..cd6fbf0f9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d126g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d126g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x607e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x511094977662c30977cff5833933e39d613ed936d07299c88e6304b23ce833a1",
+                        "s" : "0x51606acd0b3022dcdebf719b5db8839a2581378baf6ac34fdf8ca52b24d08519",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1270g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1270g0v0Filler.json
new file mode 100644
index 000000000..96d399591
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1270g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1270g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104f6606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x23c1f9136959c56609e6f0cbf5c15941ce4be8645739735a282f7ba978589ebc",
+                        "s" : "0x11c8812aec9b6cd28142224062be15bf83319d06f6e35aa1922260e167125b34",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1271g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1271g0v0Filler.json
new file mode 100644
index 000000000..be1e1631c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1271g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1271g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104f7606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x91a1cb84b1aa898644855d7a172e297d691669519c2266eef7ab9be6551f8fbd",
+                        "s" : "0x7c79eedfce270c141d55dca4036a562be111f98de1e3917e63d74bc60816f2e8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1272g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1272g0v0Filler.json
new file mode 100644
index 000000000..a89a8ebcc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1272g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1272g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104f8606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2f52d302b449c7960d10b465181f20c593ca20a6fe5a3b8dad3f301862122b5e",
+                        "s" : "0x0d274450ab8da03864f8942cc7cfa3c788a2718ae9d1d8638c190cdac08cb6d4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1273g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1273g0v0Filler.json
new file mode 100644
index 000000000..607bcda81
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1273g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1273g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104f9606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb657bffc6d09c56f34bbd2b869de9fe115054506af48079c9416127f4071bad5",
+                        "s" : "0x5321fb39383e26b814a012f751b8763342fe17202de8a8b023ac17c4b7e25537",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1274g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1274g0v0Filler.json
new file mode 100644
index 000000000..0f78fbedb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1274g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1274g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104fa606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8970ad8e9614a69122aad9b5f79f4bb3b4a840cb34d746db3003d5b1a3cb69a0",
+                        "s" : "0x56c7fe786dfe0dca17621b2fd2c35d5d1718884aa1502fd883b313802eca8b15",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1275g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1275g0v0Filler.json
new file mode 100644
index 000000000..f43eecd58
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1275g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1275g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104fb606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x10309e23d62e4429bd2f254f33eb6b8f677faa6dac1e77cf349a07192e577ea2",
+                        "s" : "0x400b956a219bc2eae3cbf7bb9772e1abfc7976418f907ff25f7ad238b5e331ff",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1276g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1276g0v0Filler.json
new file mode 100644
index 000000000..2fc9f03f6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1276g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1276g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104fc606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa059e3b31ab358c87e73a3c4a70b41d7773a761f29b41b5e6b56ee304b4a9561",
+                        "s" : "0x25b778f8f767c9d6239a58a3423cb9aa326fbf2f9fa4c47af6af4849d9da9f56",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1277g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1277g0v0Filler.json
new file mode 100644
index 000000000..bcacb4452
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1277g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1277g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104fd606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x790c1454b79acf536aaeca6d6d81168af6fbaa8306816584d6fb1dc2b58ad552",
+                        "s" : "0x04d6b36e1a4650b2dddd42b3a99063b36348aa50e1378f1daf3730e1bbb19dca",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1278g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1278g0v0Filler.json
new file mode 100644
index 000000000..05695bd72
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1278g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1278g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104fe606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x19612b8ff64f9513ad59b95f2e3eb477eb26d5c8c7aa8ebd94a1a5d39f1b89b6",
+                        "s" : "0x38ae9c9dc6c4d0efb8d012104a9c567b0b1e14596586bf6e270cc03594bf6e40",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1279g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1279g0v0Filler.json
new file mode 100644
index 000000000..aa7f64849
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1279g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1279g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6104ff606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5c3cdcde1b87ff98439ba52ac68afd999df732b7d48f9f9d40db01827645ec41",
+                        "s" : "0x096dc6f1ebd3b16641fd5059a7f836a4bcefd006982337ffd39e5d847f733f41",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d127g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d127g0v0Filler.json
new file mode 100644
index 000000000..d3e5c1ba8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d127g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d127g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x607f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x26fd4dd748479599ed6b54d80f03dbc02eb9e7cd1b36aca851831e5229154093",
+                        "s" : "0x71f7e7b1686ed05439985f452521834fe7040f1ecd20ed2abc14489c2a89e90b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1280g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1280g0v0Filler.json
new file mode 100644
index 000000000..5b6e141b6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1280g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1280g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610500606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8c69aa1d8d1252d67ae6e6b5a34994ded807ca13d7cb455e08061222aea687ad",
+                        "s" : "0x6f3eaaf31628ef71b1c1e1ca2759e132250115578fd6ab0f85ebc326105e4162",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1281g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1281g0v0Filler.json
new file mode 100644
index 000000000..5817f492e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1281g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1281g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610501606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x98589b9eda77dbc1fe90cf8cc0899dc9357a30e7ce303ad575039d6239662d7e",
+                        "s" : "0x3ae52ca8459206e3f5ed0d67a171325be58cfe0259c026595540e84508efc7c0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1282g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1282g0v0Filler.json
new file mode 100644
index 000000000..9634c8258
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1282g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1282g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610502606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x37ba747cf49642e90527b20c010e30fd589187e41f8d49c1828af48f2bfd533e",
+                        "s" : "0x13e5c99bd88ec0e0c57a2a76ef586f45075d737f1f9a45e9ab5b69ff201cbe5b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1283g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1283g0v0Filler.json
new file mode 100644
index 000000000..9b138a054
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1283g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1283g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610503606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbe39e8a96788924484e705e4952a2b010fc6b95af9cc0b3c84f72aee65f92d39",
+                        "s" : "0x797d213f7e7903fd979546bfd02853b253586915a959b1e3fc3604ac10d9781e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1284g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1284g0v0Filler.json
new file mode 100644
index 000000000..092927331
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1284g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1284g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610504606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x363a7f9b2040dfc069100b6739995ee1e00fd9423d6ab7883f05a162703b5b6d",
+                        "s" : "0x76f889528c133e60d840a3924452cfa01ca88c38fb0a8f3413f6b7eb99819138",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1285g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1285g0v0Filler.json
new file mode 100644
index 000000000..3e2d7bda4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1285g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1285g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610505606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3b5aa7e01344c393c11dbd2da6fc9dc9f3574dc7a4e76cd79e588f7b291829bd",
+                        "s" : "0x293428426566b63db54ae825b546639431f6649993576d5433fb6f4562447449",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1286g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1286g0v0Filler.json
new file mode 100644
index 000000000..cb963a438
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1286g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1286g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610506606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x75b2aae861f59053226b396db784c1619461c6ccdbdc07132d04e4ae6a1884de",
+                        "s" : "0x732159414992e28d7718ad568c8075d7db0acb6bb08d6c978e8cc215700618a2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1287g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1287g0v0Filler.json
new file mode 100644
index 000000000..faf0a0b48
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1287g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1287g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610507606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x56e37f207af8947ac0e1f4b25719c8fc2dfd80d21b6700ba6835e418cf81f86c",
+                        "s" : "0x438b836c24ded08877436d1ba61b4cd685924255b44247589fe6ce8e0b2cd044",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1288g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1288g0v0Filler.json
new file mode 100644
index 000000000..80789c945
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1288g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1288g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610508606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4d569a65e3679d0f86d688f2c363774e9a2a037e76a10bfc09bf4221c07c0ab2",
+                        "s" : "0x1bb61b0af3537134737836efdf8cdf51b6e0dc8c2d0dac06b15749460ea991fe",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1289g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1289g0v0Filler.json
new file mode 100644
index 000000000..26ab54c93
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1289g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1289g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610509606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1deb853d22e379f1fcaf1a4f623b1554157fef2984d020f9fd31fcfdc8f48c46",
+                        "s" : "0x6d2f35546e328328396e5b345aa9c420a0be3c2fd47730ed1fc143c935451f9b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d128g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d128g0v0Filler.json
new file mode 100644
index 000000000..2e469704b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d128g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d128g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60806064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3a2042419d5fa4c9401523f8a218c8f91a0b507ee4b774baa0e0a4582cf84955",
+                        "s" : "0x3635e958b4e874789267d73536ce551b7b1cb78924831d011f693f2f0d6e62ba",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1290g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1290g0v0Filler.json
new file mode 100644
index 000000000..f53bf0d0b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1290g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1290g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61050a606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaa03dce0dd3f696a91f8bcb9062ba53fbd308824b909b6bbad2935af228a1172",
+                        "s" : "0x56b04c2d953e7f42db5917c16bc85da23157818c61f1e25375e869dd04bc5c11",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1291g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1291g0v0Filler.json
new file mode 100644
index 000000000..62abe13a7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1291g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1291g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61050b606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x90b16e8a8674403a325795a9ad8d26f8d516f503ac529c27f67c931042de8d31",
+                        "s" : "0x6d350e47cad9f3c336a11b611333f1e1a5f3e7675a5a98e1f9c5a13815b5c1ef",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1292g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1292g0v0Filler.json
new file mode 100644
index 000000000..3e52bc697
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1292g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1292g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61050c606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x79fa050b32ac610bc0dac439d46111910290588ac161cf73fb2c8034ceb297fa",
+                        "s" : "0x0300ec49b885d43bc19e1db37fbda02d5bd6d563a0e059ce20082c40b6225113",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1293g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1293g0v0Filler.json
new file mode 100644
index 000000000..c518816c0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1293g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1293g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61050d606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0cc2889ef450039ecde053c1c39787944a89795e850bb474170ad7902ee3b4cf",
+                        "s" : "0x274fdf19e72db3ceb4e2366fd14ece2bc16bc2c8a319707a8ba64167d14fabbb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1294g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1294g0v0Filler.json
new file mode 100644
index 000000000..08cc5e218
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1294g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1294g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61050e606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2be716010a1c7610555e155441db7295e38de27798cf20b78c66f0a4fd0dbe93",
+                        "s" : "0x11de320f7732081906f5292f3e806cc429b6fba93b5dd8ce18af9cf44cd4a998",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1295g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1295g0v0Filler.json
new file mode 100644
index 000000000..cee49c074
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1295g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1295g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61050f606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1016717e8f6a4c1dc32652a4ad41a3ed8976ffa1ccd91583614823fcb2006d65",
+                        "s" : "0x6c43c36ff2b43d2e06a38df93dbdb93e9857cec5e9186f89acca00a9fcd24b19",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1296g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1296g0v0Filler.json
new file mode 100644
index 000000000..77b296bda
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1296g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1296g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610510606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9b9eb61eacb5f5b6ec3334ba090762b0bedfd4e0bf3c4149dd9f9a59b985ed7f",
+                        "s" : "0x4c5e5f1a5fdb295e886dd4ac96edff1449728fef6c3e5f85ad8b63e17c707fc2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1297g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1297g0v0Filler.json
new file mode 100644
index 000000000..76a77177d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1297g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1297g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610511606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9a11099964ed6a9b05f81136070797f8d270c38875024c4aba35caae3637999c",
+                        "s" : "0x5c1c02eb1a04ec21eb420d7a5e307330cd5c7ea221cbb658f9dade945b5ebd93",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1298g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1298g0v0Filler.json
new file mode 100644
index 000000000..abb3310fa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1298g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1298g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610512606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4558d3395a7ed7baa57a60b7715f02c6fcede22e7c463226ca017db13cd64c36",
+                        "s" : "0x7d8af7c727c57caca0a3c7e204fec81131f6dd6c073320635a2d924f0a6623ba",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1299g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1299g0v0Filler.json
new file mode 100644
index 000000000..f6d5ae2d8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1299g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1299g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610513606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6eddef968a26f8f6e4f085088bf04b185112f411c445922b92ee31437940f596",
+                        "s" : "0x11df88d217199af69e63aaee51e668fbd07c799ea7b6d6b61d2f44229d63fba7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d129g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d129g0v0Filler.json
new file mode 100644
index 000000000..31bdcd071
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d129g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d129g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60816064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x35aa518d6e62754b6a669165230f50afa9bbadc32f70fa4ee93a799b847f0408",
+                        "s" : "0x33a897d6ff3fc2ee4b1df6e31f35ddc33ca1eab290a72b224a461f21ac045115",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d12g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d12g0v0Filler.json
new file mode 100644
index 000000000..aa4d567e2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d12g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d12g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x600c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa0becef1cf05f44bc6bc2e3b6e6eb5785b55a0abba5b50e3248767ffc3afef0f",
+                        "s" : "0x54c83c7a08be2fc7de8ba66195b41ef14a72c8db288f37f5fbc2bc0237790b83",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1300g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1300g0v0Filler.json
new file mode 100644
index 000000000..19c2de866
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1300g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1300g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610514606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaf4a44de026311dd6df2ff8fe2ea481d4df6d76a836f7614301d4d41a4ed96fd",
+                        "s" : "0x7a916aeb7280a5606121f0304d83e837b27faba4def2cc8ad4b725320b26c451",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1301g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1301g0v0Filler.json
new file mode 100644
index 000000000..bf21a0b5f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1301g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1301g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610515606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe9723d8186da9af403490dcb4ad80b9e0baeb61d1f45430b2ec34e524c51fbbe",
+                        "s" : "0x4ed7e208bc146701a38f609a3c1c7663e4da3c4ffd88295baa7e2b4471184c34",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1302g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1302g0v0Filler.json
new file mode 100644
index 000000000..af1d50abc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1302g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1302g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610516606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1cdd773ab2225809e06d6edfc2ff70c6328dc2ae4e1233d81f1542be547cad59",
+                        "s" : "0x363f2223edc22f850350c65716597129d1206b248ae647b47e7780042140ea89",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1303g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1303g0v0Filler.json
new file mode 100644
index 000000000..a78365edb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1303g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1303g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610517606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4e3e6768b48c512cdfa7993b93c31c1b1415f3e742ccfa6d28332e24873b2fa8",
+                        "s" : "0x5005146b1648d5a79642c4328816e416017e39f3df00b33cf3fc4a50c310a6e2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1304g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1304g0v0Filler.json
new file mode 100644
index 000000000..8c01d869a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1304g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1304g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610518606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x985e1ec4a7328065b98d654da82b854381411401384de68755b437fbd86a6e61",
+                        "s" : "0x25e51adcb40a71b0ea4ec4e071d645ff19448a7aec79a2350fafa49f357aced3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1305g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1305g0v0Filler.json
new file mode 100644
index 000000000..263948e88
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1305g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1305g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610519606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4c76b850e67c7d5876119391b96c276f05500c1bbbcfe8cd6b799f0a17ef4ff7",
+                        "s" : "0x52d9e4c14f8a866922990eac73fdbd0dfecd3759d6bf4c1b392ca702bf46e00d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1306g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1306g0v0Filler.json
new file mode 100644
index 000000000..37cd411f9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1306g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1306g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61051a606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe451f3589d51152b7de8d6529293a5f3aae00b326851767bb3598dc0f860d26c",
+                        "s" : "0x42b125e6d4721ececbdf3da453a1350c22c99a0e0be90b6be0a19be29b5c9d86",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1307g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1307g0v0Filler.json
new file mode 100644
index 000000000..6cd370d6e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1307g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1307g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61051b606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2015ebd4275f2fb15f49886ea4adb7ffab9e4f3d802d0814b66482166c9a72c1",
+                        "s" : "0x07f8f48deadade34bbde5d764fc666c45bcbdee12c27acbb1747c3e0201ff977",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1308g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1308g0v0Filler.json
new file mode 100644
index 000000000..aa004a9a5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1308g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1308g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61051c606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x36b81952525251fa2d77f4e1ca0d2d7b002469dc0a5bd14eed15e2f20841b476",
+                        "s" : "0x7b2dc6581e715da8c5d81ab77eebe848f9ef1546fe9deaffb3029034439b4f23",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1309g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1309g0v0Filler.json
new file mode 100644
index 000000000..5de9d5455
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1309g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1309g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61051d606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xde08c584d06633736acb41e0336303a019c8465f749c609d6640f6cf4822cbc9",
+                        "s" : "0x5ca0d157fa579752af9f4f8c7ceed5c8e4651e5d999864f65f521b2b37714ee3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d130g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d130g0v0Filler.json
new file mode 100644
index 000000000..70258bea8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d130g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d130g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60826064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x583e2b2c551d4054738fc523a1c96f634b668d3138620d9c34f05b52db85a062",
+                        "s" : "0x579c67c410863ebaaec143c7a388a39b036759f7d9f9de264e992d139a02dea6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1310g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1310g0v0Filler.json
new file mode 100644
index 000000000..18c9629a7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1310g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1310g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61051e606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb63b532477e308c2d971b138936b249b26b3460e9a29cd84062cad432ee2205f",
+                        "s" : "0x1174da46871301c74d26dcf3fda80d80f56ef5167a616e1bcb454cbf74b9f67f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1311g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1311g0v0Filler.json
new file mode 100644
index 000000000..51a7d673b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1311g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1311g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61051f606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcba5effc738b66845b9b83a818ae60bc9f2194f1bb6fc903cf4d43973d586434",
+                        "s" : "0x3007c9bebeeb611ba9853c9f967d4871c0cadd2e174bbf4da01a7f36911f3209",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1312g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1312g0v0Filler.json
new file mode 100644
index 000000000..2de7839c0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1312g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1312g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610520606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd73cc40425c80ffc6c1dd80e229b93eae5e2e43b3d0e91ed03b2f3d201bd2aac",
+                        "s" : "0x2ed390d7041a81f9ce8e72bafab193b06eca6ea5e6d67b5eb0a43802988a5f50",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1313g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1313g0v0Filler.json
new file mode 100644
index 000000000..d39b3a1ac
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1313g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1313g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610521606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x15899986912566c3fac55ed19c1127022a7589d68be2b61620b5d60576d273a1",
+                        "s" : "0x7d5d9e1de043089395a4287cedd7ad468c3540e02996453bd95a23de1bd8ac9a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1314g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1314g0v0Filler.json
new file mode 100644
index 000000000..ba07d8637
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1314g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1314g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610522606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x249971ca19b82e4b85b2c6a1460ef01b1aafe7370e31a48df144365f7da669b5",
+                        "s" : "0x7ce71b0e76ed3ae09c556a9a1ad0ec7219b5904eeac04bea96a830c494db1923",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1315g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1315g0v0Filler.json
new file mode 100644
index 000000000..768ae78b6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1315g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1315g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610523606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3bcdb3f01f05f30481eaf5de414d8380ed1f615f546b994132d21abdc9e85297",
+                        "s" : "0x61222e0d4e3a45ac7b0d7d60e029d6a5c3b8c58419e5278518c679a7919603f1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1316g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1316g0v0Filler.json
new file mode 100644
index 000000000..4c9136006
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1316g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1316g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610524606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2698b360a963491dc175ed3f6afa30a6f96d14aa2e2b982c4a3c6c3bccecca84",
+                        "s" : "0x7ca77cef1ab2820c8ca0e32c39ba07d8a2bbeb55d1b7d6af12d768a8bc7bf03b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1317g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1317g0v0Filler.json
new file mode 100644
index 000000000..071731064
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1317g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1317g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610525606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2562dd4c0701cd03f0c84835a7ebb089a6e27b9f2d7c31c60957db2d82ce6a65",
+                        "s" : "0x828725f28428e0df0bcef86a36e8ae53e3ed03713ad3b1be18d921a9ef256b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1318g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1318g0v0Filler.json
new file mode 100644
index 000000000..602dc6a5c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1318g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1318g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610526606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe9f1eba5873df9df8e6a19ba95cfa35ea8cbd03779a43e6aa6df5c4f8bed9ffc",
+                        "s" : "0x6a3339620719fe58bbb1aeb2e55526562be148ecd45787bacd7c3290375d8b37",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1319g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1319g0v0Filler.json
new file mode 100644
index 000000000..64a95ccaa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1319g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1319g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610527606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd7b83573e0f5ce707f23b84b64de80f2a9aaf1f24150b2df4534f28bd27a4497",
+                        "s" : "0x3054735b33a3b2b95c8f6f759091401b995f523a7cdc8b69935da09cf4726d37",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d131g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d131g0v0Filler.json
new file mode 100644
index 000000000..1028a0f9e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d131g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d131g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60836064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x75db66d6c24663de5f1df092941439112f9109b499983815d9b37ac91f695455",
+                        "s" : "0x5d98674e5c1b91ba93b4eb0290816fab6c45e14549240c690dff506ee8fadec6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1320g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1320g0v0Filler.json
new file mode 100644
index 000000000..dba1ca146
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1320g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1320g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610528606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7318e61c70d0cc50c5c75712684ded180b806946fbdbd6d55ca50e38fb83047e",
+                        "s" : "0x014088497d3b139a4e9245c2b87a76703ad0d80afdee22550b38a389c5003293",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1321g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1321g0v0Filler.json
new file mode 100644
index 000000000..9d5fc5e4a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1321g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1321g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610529606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa47524accbdbcd52e85c1c16e4116f79bbdfc3e4d78f3251754d83588adda265",
+                        "s" : "0x1e24bbdb31f640922745003f9354b76637cb71c9030d7729e0897d2391bc25fd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1322g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1322g0v0Filler.json
new file mode 100644
index 000000000..bb6a3bdee
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1322g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1322g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61052a606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x181ebae173069ae1f60f0b1066c9f90a96b7e6f5cff8b18a7aea01d179e19a4f",
+                        "s" : "0x64dbde1a13f27fd04f2908e0e1e05598f5a183f2109a39e8b3c11cf586573a4a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1323g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1323g0v0Filler.json
new file mode 100644
index 000000000..cee3ede55
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1323g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1323g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61052b606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf8cbe5d9ecfe206af11bb0c71250deae4f6159d3e334457aa3c5e131f6629780",
+                        "s" : "0x3bdeffd65f58e21940bc8ecf32476bcda70b30b0d7cd87376801b0364c84b683",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1324g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1324g0v0Filler.json
new file mode 100644
index 000000000..cb4ea05c1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1324g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1324g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61052c606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x381864774e20797871bfe61fd7576db7153bebac7f1c29ca1852afb0cb7b38b5",
+                        "s" : "0x7fc5953b1efc16b056925f6cb9dd66e97a5c7c8e9f74c8e87b9618842201b44f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1325g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1325g0v0Filler.json
new file mode 100644
index 000000000..c249ddf5d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1325g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1325g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61052d606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1f9d88df977d052fcfdeed220d0e1421fdc48b9a5f42e8e55e6b8e2f1237103e",
+                        "s" : "0x284f1559e50bfc5197a7f78fae110098f0cccf1951da87edcdd2a954d4756811",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1326g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1326g0v0Filler.json
new file mode 100644
index 000000000..26aa3c031
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1326g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1326g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61052e606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6c7c87c3a21131a0832bb98b2959ac041de58f7c13bb81ed408af45b8d2ed4ee",
+                        "s" : "0x1137fed46022abc4e80469958460bff2d13562157bc1a4c34cdaf70aeef68e2e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1327g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1327g0v0Filler.json
new file mode 100644
index 000000000..3ddf715fe
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1327g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1327g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61052f606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe6b2ed7f184a0db1f31b21b4e07270666a11ec6f6e16e2842d5ef3307c119c37",
+                        "s" : "0x23315c922f8ca69356efff7cf2d009de840223fa41093d78b3ae3899e51fcd4d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1328g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1328g0v0Filler.json
new file mode 100644
index 000000000..5d8ecefea
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1328g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1328g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610530606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3b2122f90a7e49879c32f897a9653a33c693d9573352fe28768035bd3667e9c9",
+                        "s" : "0x0130f5d5754f740e2f9d7855f37e7efe0b40adb58e2cb0103e18aae7a411005d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1329g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1329g0v0Filler.json
new file mode 100644
index 000000000..218ad7f4f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1329g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1329g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610531606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8018af6c29e82c3a00a47252d5084d22cc6b96ec312e2fc8118e2f006b7a6eed",
+                        "s" : "0x7fe0974b5ea610be273e2ebd0eaf6f2d6133825d55391f7330b2007874a9365b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d132g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d132g0v0Filler.json
new file mode 100644
index 000000000..c293217bd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d132g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d132g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60846064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbcd3fb31d1cd0271306b87bad3640518b6ee8bbe0989ffaeeacda94b97ea1062",
+                        "s" : "0x058520d494785d6eef24c7f82f335f62ef9058a6a1f0c556bbe44b8e046b0f83",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1330g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1330g0v0Filler.json
new file mode 100644
index 000000000..ece359eb0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1330g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1330g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610532606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcf2f5ceeb614484e16be7ecbbc132235011b718ca951d7550963d681051bac61",
+                        "s" : "0x62e0902a1ec693c22f080f865bc570dc89d47ff82800e62ac24a4a2207d161cb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1331g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1331g0v0Filler.json
new file mode 100644
index 000000000..7a2c64cfd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1331g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1331g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610533606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa671f9e28e4849be3f6203fe46970235f6a43fa360a2f58e719636171d9d1b5a",
+                        "s" : "0x03b6a580d14fb81fee6cb84c2947f8560ba5440efd1a06bcaa782379138f12e9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1332g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1332g0v0Filler.json
new file mode 100644
index 000000000..ccb0f318a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1332g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1332g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610534606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x89dd4d7c3074be6df81f491905e3e1f6dd31a3d3d6a59b610dbdf05088421196",
+                        "s" : "0x2c892edca4d6e9c5c4adf17641789e979dd07523edeb15fc3d63fb332bedfb91",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1333g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1333g0v0Filler.json
new file mode 100644
index 000000000..28f063805
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1333g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1333g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610535606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1f337505f564d1bd147bdb120ff769ecccd0ab2dcf2a84ca576a24bd28b58170",
+                        "s" : "0x5fc0799e0953bb6f402e97e5a15df1e7cf4e885756b24a9f17f700fd1da76f11",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1334g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1334g0v0Filler.json
new file mode 100644
index 000000000..d836cfa0c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1334g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1334g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610536606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1befa96c622fca4681424223edcf6218d1ac29e11f4cc1018fd8e8b65cab4512",
+                        "s" : "0x38b6e28a0b746d96caa9221da4838b352aac9ff804a36d02425c7de8471f8d63",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1335g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1335g0v0Filler.json
new file mode 100644
index 000000000..22963f441
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1335g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1335g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610537606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x452c4b70d8b68053086cd69f141aa1f0e703da476d1c66ff61327cd382185bc0",
+                        "s" : "0x694b6fc52a162d399be65394efe4cf7b001ee6c9c91b9cc5e9e208c6cf57866c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1336g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1336g0v0Filler.json
new file mode 100644
index 000000000..5693c0d80
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1336g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1336g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610538606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x772fae5aa6944690ea76227b6e9909a7fff9aee9359582f9a113178288ac08c3",
+                        "s" : "0x053fc9b9328f345178540a45eed30dd8ba5dd7a0d0d8a1f17deaf4089d9a4202",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1337g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1337g0v0Filler.json
new file mode 100644
index 000000000..2640eafee
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1337g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1337g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610539606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfcbb29eac23df00ddee28509191ce759e905f7dd3199e8502e875188372e3920",
+                        "s" : "0x3a3f9ca1009e41bcf73b474104bed48c194c40e600eeb1e2457c4a2f4c531fe5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1338g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1338g0v0Filler.json
new file mode 100644
index 000000000..c44632ac3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1338g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1338g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61053a606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe8c72f425b47fb63943fc3e5c9255f94790ddecb4229d42bc64f4a0dbed491b9",
+                        "s" : "0x6cd340522e808b771d2a885d6075aa5b5715b23fc95596bb5203cb18f0b975bc",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1339g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1339g0v0Filler.json
new file mode 100644
index 000000000..5b10f1f02
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1339g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1339g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61053b606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x42e804e010623d61e7edb1c94c5db0cfaa7f44a58fd9462c05922fca5e0f635c",
+                        "s" : "0x79ae41acd5ed59920b5e9b039240a20a3588152a0ae8e1a7a8948da95d0ccd5f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d133g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d133g0v0Filler.json
new file mode 100644
index 000000000..41dfc9c1c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d133g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d133g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60856064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfac6f42555b7396e4e3dd30d05e5cd5426e460357442a7d8489cee502e7158a7",
+                        "s" : "0x209f487766c432f538d9036de35bab88d793a4f0e0f6d061b194a010bc71cbc7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1340g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1340g0v0Filler.json
new file mode 100644
index 000000000..e15cd400c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1340g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1340g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61053c606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x373357ff3128c7cd281d34c3d3a29a1d17c695aa2b818fceeea73504d83deab9",
+                        "s" : "0x5b11774968222e411e66a7b9195465e4bbc130cf33f4308bb3d2898d70ef3e60",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1341g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1341g0v0Filler.json
new file mode 100644
index 000000000..5765866e6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1341g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1341g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61053d606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf2d82ec5e977828a1ee92b69f5084c0dd4f3bf69d1bbb1128aa3a43210e6c814",
+                        "s" : "0x36ad250c5786a6559dd3231add153c2df6e972e7f69fe9ad803fc88ba2f26be0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1342g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1342g0v0Filler.json
new file mode 100644
index 000000000..a50677575
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1342g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1342g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61053e606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2d200774dc1104ef57ae84ea0f1da551bf6bacdadaf95afd289c18d472efef3b",
+                        "s" : "0x43e07e2d8b17373fdb0e4f4c3ab24cc1a746faea8b650039f01fb491aea9328e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1343g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1343g0v0Filler.json
new file mode 100644
index 000000000..586b2bc2f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1343g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1343g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61053f606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0a0e57dad04601c0a8c2f392cb62e52a841ad1acff189e395675d0feb93a5e5e",
+                        "s" : "0x657590ae72a943df3ace3874fca82f8eb9c9697c2cfe6fb3f4672953729a46",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1344g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1344g0v0Filler.json
new file mode 100644
index 000000000..c40603d4a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1344g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1344g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610540606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x83b31e4d9bbecf3ddd68e3e3478677c8c4a3a3db08846d6b99b47cb9542224c3",
+                        "s" : "0x733f93f692bf09106fa9928bbfb9102d2aba1fe5e84bb7949ecb54b34685792f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1345g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1345g0v0Filler.json
new file mode 100644
index 000000000..dddc87fad
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1345g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1345g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610541606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1b1fee2765d43b81513ad8b13be2e6cee16a65ec8c2faf78d55614c7d290ee1c",
+                        "s" : "0x0b2f856b8429de7ff6b807f3f8c1c7de926dde9073753a53dc46388c990c6b10",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1346g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1346g0v0Filler.json
new file mode 100644
index 000000000..6928a7125
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1346g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1346g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610542606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8c4df92a364ab8809e4b8ba1a973fc5dc2a9ed6a37f887b43ec55a3222dea957",
+                        "s" : "0x2a5ebfb1020a5f8715a187d23780808b188d593fe9ac7767aedc9015e2284f98",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1347g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1347g0v0Filler.json
new file mode 100644
index 000000000..bd442e571
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1347g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1347g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610543606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3378bd799a8375e6a23400731f43b433ce58d1866dff9eb85856f9e22e2071b0",
+                        "s" : "0x297799396324364ee04e7778e9eeae357f36c692772bab6a06c07afa0d2072d7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1348g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1348g0v0Filler.json
new file mode 100644
index 000000000..0743fbb3c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1348g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1348g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610544606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2eda1927fc54b12f2ae7fddcd60fdba9ff6f49868c8b0f9123726d89dbddf9c8",
+                        "s" : "0x4df82b8ddae8e4125d689eac9b10b0f811f2787f44ae5df626e5e9ed392d7159",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1349g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1349g0v0Filler.json
new file mode 100644
index 000000000..1cddfcfc2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1349g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1349g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610545606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa75244afd9b2e7ebac6ec70a7830f063fb81e1bf39d0ea70a4e111f8b6b15cde",
+                        "s" : "0x631b31a84c4274e9ce6c9df401e843e247bfacab31f51d293e8ba3b1b1fc4895",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d134g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d134g0v0Filler.json
new file mode 100644
index 000000000..fca2cfe54
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d134g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d134g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60866064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc4d4ce37217d55fde7b2e7b2b3717f2870e40a09e78ac72247d2b06c3dd41fef",
+                        "s" : "0x2f5d3ccde4895f2b8d5958a17c69de97f2f323d1a0d6cf1a382df039352722cd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1350g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1350g0v0Filler.json
new file mode 100644
index 000000000..ad00a6266
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1350g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1350g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610546606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbf20633028880e33211029a568d002180c5b87aa577f3372df6a4b81d27c3425",
+                        "s" : "0x521ae815a8c10984f09f1bc5365ba7a7ffc5df142f0b4f2e3d249d3426d3cbef",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1351g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1351g0v0Filler.json
new file mode 100644
index 000000000..a36275b40
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1351g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1351g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610547606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5a1a7b9683d966b9aa1c9383576d339be9d8376a37c570760a66702e9d06c12c",
+                        "s" : "0x0b3f47e774cfd0e84a903b6cbe538c6ee94037a2a63d0590ddcabb3478c6f45a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1352g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1352g0v0Filler.json
new file mode 100644
index 000000000..d42ed36d5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1352g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1352g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610548606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaf26cba915f6c59310eea61d785ee042b1d5faf19b08266a577a40bd2432ef10",
+                        "s" : "0x0df8a13c0fe0cb409a1bc5b9008a9de1098e9d94af61c8b2191c12297e83bbc1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1353g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1353g0v0Filler.json
new file mode 100644
index 000000000..c0974c4d7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1353g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1353g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610549606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdcd275cfb99acfbaf48791458a544024a9c770dad723eaa0ea4ac286b8035773",
+                        "s" : "0x2fe3855e0df7a3f73a21e296e8caa4811f1d96ad24b85ddd6345dce9eac3fcd1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1354g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1354g0v0Filler.json
new file mode 100644
index 000000000..5c47228ef
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1354g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1354g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61054a606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf19562a57496dc438d91165056d642cd9dfb63c0b2fa98ffa1e385f7f09f472f",
+                        "s" : "0x40fa41ef9a529c6d3f5b9cc98304cd134cb964cec94dc0cf2c6cb2d083f9d325",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1355g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1355g0v0Filler.json
new file mode 100644
index 000000000..6917dc741
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1355g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1355g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61054b606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdb6672f1ff051005793d3e4c2ff30a431fd6879056062d3f13e670c8b5943199",
+                        "s" : "0x2f30e8c1507e92cbd750cc1bc2fe2d478ee3db4acc1e195463c1e32c85cda3b8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1356g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1356g0v0Filler.json
new file mode 100644
index 000000000..eae27bf2b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1356g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1356g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61054c606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x353781fae76f06cfd974556a6248f9cab3108adf59f6cd894495584b2f073141",
+                        "s" : "0x53bb744ea3c9e10a5ab636ab9ac028a3adc78fb612d85a1b334a146a59260dc9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1357g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1357g0v0Filler.json
new file mode 100644
index 000000000..5065b54fc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1357g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1357g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61054d606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1ba2c3bd641aa539ed501a38152e5d9711a940462329f179e4d2e96a0d22ab73",
+                        "s" : "0x38ab8625046c67baed624041ef183554c3b2eeead15edff369ffb79b28a79cdc",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1358g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1358g0v0Filler.json
new file mode 100644
index 000000000..0fc066506
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1358g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1358g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61054e606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x80a2a8f69b96ac09e6aa4be8340f60d2448776cdf76f58ec582d3d1d669866e5",
+                        "s" : "0x1eeb590119739de4a7bf1b25045e442ad2b5fda4cb4054ecb9904d03f51a0301",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1359g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1359g0v0Filler.json
new file mode 100644
index 000000000..19ce5bb55
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1359g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1359g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61054f606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x695b7e5fa5bb788a6c099cd7e75fee6e245396a5e6fcf25400ce16feaf8da4ba",
+                        "s" : "0x0aeeda6e7773648898f10a080f2aca52e91c01e8bcb0bbf2e768855307161d82",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d135g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d135g0v0Filler.json
new file mode 100644
index 000000000..a08167e51
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d135g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d135g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60876064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf820888be8aafe4008863826db0c7c0144444c3cfa2a929d4c5b7535c01f0730",
+                        "s" : "0x307e4a686f75640a44fa9f0d850cd2f755eff348993b0ee93c90a068e04a7203",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1360g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1360g0v0Filler.json
new file mode 100644
index 000000000..114147cef
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1360g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1360g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610550606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x81d0dc589107e163df3fbca087dc5f86a2d095a964755c878fc9111763c60610",
+                        "s" : "0x290f93773bbe52c28a510409d05484cba33875c5fae34733f1ccda292abf6ebd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1361g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1361g0v0Filler.json
new file mode 100644
index 000000000..7735d55b7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1361g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1361g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610551606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb29f9db160f0e8d1afc842f000a2d54b09cd1dcbbf87b5701f9efa645b2bd6a6",
+                        "s" : "0x3dd7234e542d2c6e6b0a86cfa087a3531c5f4eb14bff612a51617d7f827dafa6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1362g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1362g0v0Filler.json
new file mode 100644
index 000000000..29df079fe
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1362g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1362g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610552606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa448f361351bf3ae4bad45f1a55ab3a230820fe64a7b38131bb9252b5147fc0d",
+                        "s" : "0x4e5061412bbeec515060e67255f2a8bbdc40fb55c9489e3aee013af9e59b5ab9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1363g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1363g0v0Filler.json
new file mode 100644
index 000000000..39cf06d60
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1363g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1363g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610553606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb676314fa3a4b0a41a7d4419450d59647479df510d71448f2df601f71e53d351",
+                        "s" : "0x164f9e545b89b7c6af9af63583c6b811daa811cc34eb15ed909929c4af61e042",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1364g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1364g0v0Filler.json
new file mode 100644
index 000000000..95c1e72d8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1364g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1364g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610554606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6cc4d5a2eddf29d49b37d55d85545b6d3f39a0b1b62635fa4463b6627e24dec8",
+                        "s" : "0x5dfa8f169a00a76a45989e88374ebc040adca8494bd1fa0acf82b61b398794f1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1365g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1365g0v0Filler.json
new file mode 100644
index 000000000..f6ab32e82
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1365g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1365g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610555606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe69bc66361f0e837d199517bf73711429a617920b6104aaed91c06c78b1edb45",
+                        "s" : "0x2d78367ae9b643da3b910b3b95354fa2bb4778a386ce8375e274109b936dfc62",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1366g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1366g0v0Filler.json
new file mode 100644
index 000000000..419eeeb84
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1366g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1366g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610556606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5e50e978ee9e51f36460d85efd4fc6ad7985c7ab4209b843187297eefc3a50fc",
+                        "s" : "0x547dcae5457b39c36dec5117be41a5fc1135c1e672c2d82d14b6b6bdfa16c116",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1367g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1367g0v0Filler.json
new file mode 100644
index 000000000..b00c41eb1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1367g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1367g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610557606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x28c2e29a68b773e9f7e97dd226c9838996ab2a45ae8c6abf70418146ca7d577d",
+                        "s" : "0x0ea3e06e004412e1078318ec5e6a07bd1b4fc8d39e45bf73dc16bb704ce461a0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1368g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1368g0v0Filler.json
new file mode 100644
index 000000000..5ba7a936f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1368g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1368g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610558606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x79dc00dcc251541b9432b554e9559d8ea0698462ccbba614751faa7e36510c89",
+                        "s" : "0x6fe3d2c553e9de167bbe8cb492a144aed47a598e45bf234a3403a1b021aeedf6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1369g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1369g0v0Filler.json
new file mode 100644
index 000000000..d61786833
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1369g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1369g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610559606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdbc55ad69c51429fa6a5388d5cf25ca7f608db2a6abce561093a24447cb1fe1e",
+                        "s" : "0x03c0f6b0dc38c80c604e6cb52e2515e3888abeb4b98b8912d370fc3b7b950559",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d136g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d136g0v0Filler.json
new file mode 100644
index 000000000..851857095
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d136g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d136g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60886064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2d4cdd7693c81ab88e6a5264401db8c4b56bf2bfec313f0d5b13ae3513c66b82",
+                        "s" : "0x49dba5c8221c6575bb249912b967f6730562ca84b089de7730c26cc8d17b821b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1370g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1370g0v0Filler.json
new file mode 100644
index 000000000..422cd063b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1370g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1370g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61055a606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x90631e2bc205dc8da662a9ca4bbbc7beb5fda2797e9ad00d9d10002612cd0013",
+                        "s" : "0x4e24ba5e64496abe6b9d57fcc68d2757243831d3f8dfa559a23abd91dd02de96",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1371g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1371g0v0Filler.json
new file mode 100644
index 000000000..ef008f384
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1371g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1371g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61055b606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4d27901b28d32cd1fd48fda036ffef5862ed352909677f4114077cb82ffa4d63",
+                        "s" : "0x64ba884e485e9a59bd5740e842cbbc98d28708b5744833a0c38b2e7ae17d522a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1372g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1372g0v0Filler.json
new file mode 100644
index 000000000..37f12f2c2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1372g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1372g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61055c606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdcf3c1c5e180280b329478c4e0049398d6443cf94c7d3428881629ac0f1d08ea",
+                        "s" : "0x1d0e67191f576389435cbb1351e056a30c3a035619735e95d98084d8e3827b32",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1373g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1373g0v0Filler.json
new file mode 100644
index 000000000..afaeaa4b7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1373g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1373g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61055d606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb57af1ae095828221e88c074a122b2ed4a312b8fcfc560523c634b5ac4f02f87",
+                        "s" : "0x045f25f565915100039c2c864f17a602295bbab0a898a67a2b3cfe6c5e179fcd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1374g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1374g0v0Filler.json
new file mode 100644
index 000000000..27eefc83f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1374g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1374g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61055e606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5f22bdb56d19cd550c703e3f7b53b9f7779b6a7c6b7351fcb0638946a249e188",
+                        "s" : "0x4904fb2d094e676855a1bc55fea3cfc25bc46bae699aced0ade1eb79b15683cf",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1375g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1375g0v0Filler.json
new file mode 100644
index 000000000..01360a529
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1375g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1375g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61055f606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5f93323d8a5a76d1defa751cc88422ca9bb9d58dfd94c5c01d647d3def401c85",
+                        "s" : "0x0154d480437cdd35f1026f8ee680f8f5d4abc53699b0011fd586af2aee65c7bc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1376g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1376g0v0Filler.json
new file mode 100644
index 000000000..ee2354194
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1376g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1376g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610560606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x48e7459735a56fa44111628985b7e9520533158dca2093dcb100a1a92579c962",
+                        "s" : "0x7099c3b6dd618d81e25fa759c24f34b436fa1591c33ed12698ab5500ed4bf41b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1377g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1377g0v0Filler.json
new file mode 100644
index 000000000..bfa2ce6e0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1377g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1377g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610561606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb731d00e7e23b283757e1d80f1197fc2a99287891a5f063673f1fedfa9bb7358",
+                        "s" : "0x5576b1ac4fe5edf7d9f222ee14eec313400ab622ba9d6d0ddac54d9234904cc4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1378g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1378g0v0Filler.json
new file mode 100644
index 000000000..ab0bbcbfa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1378g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1378g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610562606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd44e66820273dc28d41284420da6293b80d804cb862478b9216216bcb3e658f8",
+                        "s" : "0x5db9239153f6e325216d86835adbc60bf3251c5eef4811139464808af5405a4e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1379g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1379g0v0Filler.json
new file mode 100644
index 000000000..002deddd1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1379g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1379g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610563606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd825f5842cc1a919dbd1ca36d3b6134147e28f839c2036d9373ca8cc06248c4f",
+                        "s" : "0x32ac23c64212d908a06d27d1a2af4ffaec35a5791d7b18a1d2fc6585ecb8f16f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d137g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d137g0v0Filler.json
new file mode 100644
index 000000000..12e699922
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d137g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d137g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60896064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9c977d59bd53c3e24f87cd5df743441a21f55a36ec5c62b62a153d0663967098",
+                        "s" : "0x4373ba7f38a3ee58aae8aece1ed888c8afa9d5bd7e5783ed8a3b8ce2a195d45d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1380g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1380g0v0Filler.json
new file mode 100644
index 000000000..1df74f053
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1380g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1380g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610564606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x50bd77531e1ce9fee4f2acc9de7b64a2dd7b0366d9f0d64097b858524efddf29",
+                        "s" : "0x1843be56f72fb4a8ac76bfb1d582c478a92b12b4fca9cb40dc79af94d97c4574",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1381g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1381g0v0Filler.json
new file mode 100644
index 000000000..4c634a59c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1381g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1381g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610565606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0e9f415ee04db72033a9d014f8defc6054a829c2f9251c7e4082c0f512a75d04",
+                        "s" : "0x119f72ac421e1cb9f22cab6553f0d615f915438688902f0da7c765d487a160a7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1382g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1382g0v0Filler.json
new file mode 100644
index 000000000..470c49049
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1382g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1382g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610566606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x18f7974085f0a383b8a957af6d7e801b59179e18ba7834486c591ce892e29887",
+                        "s" : "0x36c9b4784109c40507adebd9fad8ca72385233d36ff3257491eabc5a641c4ae8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1383g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1383g0v0Filler.json
new file mode 100644
index 000000000..bdd2d96d4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1383g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1383g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610567606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe6cc7521963788291d4ccdd3eaf79c4cccecc18cfa4ab4b6c56d932a0ac9d46d",
+                        "s" : "0x37bc1469be84ee0ac450dae46312965c862bd701117cb1830d60f06ba08b3e9f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1384g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1384g0v0Filler.json
new file mode 100644
index 000000000..8532af484
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1384g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1384g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610568606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa3b006ea7c0d0853a34890424b41af04b860dfe4fd87ecfda44f8fb86f934442",
+                        "s" : "0x9fe30b4454257b8f36e986f4a09af107bca0ec8338dcedf7c150c0a5a8a189",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1385g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1385g0v0Filler.json
new file mode 100644
index 000000000..f032ee798
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1385g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1385g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610569606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3c6534d56a6b9b848274ee3fc2e23007bd7f6d044167e8817c4a36db7a30ec56",
+                        "s" : "0x53ae356ba56874d5702d2d0c55f952e8ce9cf82dfa0d3d5f488abc538594b225",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1386g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1386g0v0Filler.json
new file mode 100644
index 000000000..980827015
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1386g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1386g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61056a606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf41b15c3281da58afed37f994398091f8644352cc2cda9320f1b26d7840f5d94",
+                        "s" : "0x790f30ca7c78606410021ad2d19317b2a54e98df39faabbfccd764c4ba8e00c8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1387g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1387g0v0Filler.json
new file mode 100644
index 000000000..f08281bf9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1387g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1387g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61056b606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb73517612be55df204f0a1cd0a813f11d7aa35e153a4a9e31c17faae05e2263b",
+                        "s" : "0x16ae86c4e96c812bf3a9f03cfa5d7eb42bc60c507930a998c0c8473d1fd4e2dd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1388g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1388g0v0Filler.json
new file mode 100644
index 000000000..ba094779a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1388g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1388g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61056c606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x29bef5868845048d1295e29f3f1f9d37b27159f52d96fb44164351ee839a1832",
+                        "s" : "0x41227c17c5afa486f5f27c443cef0512de0d8c908309e397d423c06834dcc4f2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1389g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1389g0v0Filler.json
new file mode 100644
index 000000000..7318a0456
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1389g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1389g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61056d606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf9fede29f5bedc8399d32099a8468a700541139a7a092095a66b82013caae525",
+                        "s" : "0x1c2a8c0e35ff167beded950ae0f5047acf4fdef7164bbf76a606578e599bb816",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d138g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d138g0v0Filler.json
new file mode 100644
index 000000000..3e7c02343
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d138g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d138g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x608a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3e532d1b5d1220239c946fd81b4ca0cbdd5d13eba3001b536e603304dbfba59e",
+                        "s" : "0x0a3f58fe904a3fe916a079f6833ee10cf8e734f0660c09dcff2dc823c1808ac1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1390g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1390g0v0Filler.json
new file mode 100644
index 000000000..e45137b4d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1390g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1390g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61056e606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf51751b989e49310e67e37199dfe7189a376468cd2862762982505dc706f08dc",
+                        "s" : "0x45a1bf884d6165ea61147e8acdae3fc4a24a99319858b5334bc0ab0d4c0fcfc2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1391g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1391g0v0Filler.json
new file mode 100644
index 000000000..dd7fe506a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1391g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1391g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61056f606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x422f4bed0fe5d615094ea5d3c1ab54e4bcc6b1be3af2a9c66d70f1c2a65b6662",
+                        "s" : "0x4b693eeed7bf9c2f004d26dbe5e26a8c64c236ff4e6bafaaaeee181cd47896d2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1392g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1392g0v0Filler.json
new file mode 100644
index 000000000..cbc165e37
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1392g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1392g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610570606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x131ad314079ee5209bcea004b91a19b171d334bc00a88aa72a8c879ddf694972",
+                        "s" : "0x660f60365c83f5b9caee8dce2e62fcb9b7af2892bc4dd9f88ec809ee0a556d5e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1393g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1393g0v0Filler.json
new file mode 100644
index 000000000..22f298a36
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1393g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1393g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610571606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xca6039028431b66825b8b7c94582ff0977d06652dbbc6474a0a999e525541567",
+                        "s" : "0x29b2b7e21f5067398d4a29a8ce2bfc05574b584872331c4718fe1638fc0f280d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1394g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1394g0v0Filler.json
new file mode 100644
index 000000000..35cbb5e26
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1394g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1394g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610572606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4c3a0e9d44923b175b6ffc48f40e52cdefd69d3725de06bc9fca0f342277998d",
+                        "s" : "0x0b099a1984c64ebc9db393e06f5dbed75ccd14531d71d2454f8829b024c3bc31",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1395g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1395g0v0Filler.json
new file mode 100644
index 000000000..4e110e305
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1395g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1395g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610573606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc11e0cfd9b0240198478a7f7ce8065ef0d386a571dffabefa042e1e067508aeb",
+                        "s" : "0x5ee964c733ecb3d5c83a0ef8ad4d7e393adf7473ccc5b0904bd8d40f9e5094c4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1396g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1396g0v0Filler.json
new file mode 100644
index 000000000..344e08106
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1396g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1396g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610574606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd8a47495f22ac7b9d480390fd904b4f68f4e5d09ba66c29edb012fa4b2c57eb8",
+                        "s" : "0x060b6371b4501adf91637f67b3e0d0be73684490948f651c489388521ae9b216",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1397g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1397g0v0Filler.json
new file mode 100644
index 000000000..b1ac74a2f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1397g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1397g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610575606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x35ba6206edf282963bd47078fd852f2318207766a7d3c1ea401808ba766cc2dc",
+                        "s" : "0x1b3dfb852a6542c8aa9e4aeacc0cd74efd5f8595ea760a5285d3d7d176562113",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1398g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1398g0v0Filler.json
new file mode 100644
index 000000000..028250416
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1398g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1398g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610576606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x384613d52517aaa81a9520a361e48b913449c073bacb067c0999f564ea52f00d",
+                        "s" : "0x6385ff4488412190af0ce4f786f7f270e490b7195e3f0749ea5dd460c77bc33f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1399g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1399g0v0Filler.json
new file mode 100644
index 000000000..f2a323c5c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1399g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1399g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610577606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeb3c955cb0d16e61dd5afe0e80b31c652e3110da76247a63f414e47a4b3f2198",
+                        "s" : "0x10e9ca94ee30bc2372c484cf6ea8087d86c82ad125820254b8a04611d2463b32",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d139g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d139g0v0Filler.json
new file mode 100644
index 000000000..730f94df0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d139g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d139g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x608b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfefa89d45215d7ac486803d5b6dfde4824110cd11f04c68a2f4fbad5e7a517e4",
+                        "s" : "0x7c22e3cb9f58df09ea8b6b1c06a7106b68499c8355718975c4e7b65d6275e0ca",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d13g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d13g0v0Filler.json
new file mode 100644
index 000000000..d30d6f4ba
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d13g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d13g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x600d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1d28e46f831708434042cfe2285ba5f5d71d0ea94b9ce8bde63c8b23863b015f",
+                        "s" : "0x08c4bc6cf108ea9a8f083a79ffa1a0a1e71925dd52bb399074eb8ce7c4d12600",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1400g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1400g0v0Filler.json
new file mode 100644
index 000000000..06aca4c16
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1400g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1400g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610578606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcde9aa9e9026e2b21bca753f2d7cb89f32c9c5d5c08df38b79346bd210e16c3c",
+                        "s" : "0x17aea7e6236fef08eb2f50e300a44ec5e519ff5f9d8c719c128f15d83d8ff9cf",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1401g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1401g0v0Filler.json
new file mode 100644
index 000000000..f9c7540c8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1401g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1401g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610579606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4a73e20430e2662399ba5a1b7836557b908ff8df02698d28383b555b6846145e",
+                        "s" : "0x2e638590584e2a0f97c0cf7e3cd4a405db64d0f61bdd66d42f0ca15c4270fb7a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1402g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1402g0v0Filler.json
new file mode 100644
index 000000000..630ba7956
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1402g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1402g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61057a606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8220797304481c69430a5dba191f25318a45fab0fcf7ef858e9336328c7de843",
+                        "s" : "0x6c41f004397b79b5a66c5a55362d81a18df4e9865dd24235dd57660cb5b2bc21",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1403g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1403g0v0Filler.json
new file mode 100644
index 000000000..6be9a5d7d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1403g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1403g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61057b606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x20697268cea96fabe32084086e5e44292aa42a9a8edf4fd78ea24fcc1e4e8e4e",
+                        "s" : "0x433ea0a36542da27116de0f6a9d4b3220b0449cf8db169866b1e85c5743cfdb8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1404g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1404g0v0Filler.json
new file mode 100644
index 000000000..00b1f7f67
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1404g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1404g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61057c606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1c71b9952da4b0a8ae6718f562f5b7c24c45ae6da1d7277ddf0aeacc4a091dc0",
+                        "s" : "0x5e8c6456a0db2bf0ec1d0c8720f715af61bf97c6fec6a6267a06c43b0e1f932a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1405g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1405g0v0Filler.json
new file mode 100644
index 000000000..d70683f97
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1405g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1405g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61057d606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x563845572c2ef9ed4c0de72197aa29258d03082db28de03f2894b492b6d45383",
+                        "s" : "0x52f3884adc1324f15dbb29e8243187072065552df671ca7fe4f9aa38d85d08de",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1406g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1406g0v0Filler.json
new file mode 100644
index 000000000..8a6baa4b2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1406g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1406g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61057e606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9ed3ff56521e7623fb3016849f9103d784c5a15320a87aee2964e3fe934b1837",
+                        "s" : "0x2ac9b83dbb04b7c855d824377fd0246874185d5ef3d532bd88bb1639424880c0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1407g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1407g0v0Filler.json
new file mode 100644
index 000000000..bfff88e70
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1407g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1407g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61057f606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x047c55f99d7ab130c64dfa263f0dc06eeeed24108db58a494d53de450a177bc5",
+                        "s" : "0x39dac5bc6c47070f530ae0cce66dc4cd75451dc0d1caa5b5a52e4d1330c8c954",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1408g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1408g0v0Filler.json
new file mode 100644
index 000000000..3dccda8e8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1408g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1408g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610580606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x18ac4a941bddf30dfcc60b439f6c5afaa184992e0ac4cc5016fafc46388864e5",
+                        "s" : "0x4329371ff623229eb5ceaa05593902ae7eb168a83a835f105ee6b2b27e65e38d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1409g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1409g0v0Filler.json
new file mode 100644
index 000000000..b49b43d51
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1409g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1409g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610581606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xec0a768fdf58c9618df07bd08dd88d35b6302ee1a81e78e5b79282f4b665e5d5",
+                        "s" : "0x1d30be8f71906099a620b5d773def503a079cb04a60084b499f4023abe430eda",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d140g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d140g0v0Filler.json
new file mode 100644
index 000000000..64e4dc3d3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d140g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d140g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x608c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x294d2bc308c89baabba4224b00f0d9e385f62a5c425310e5a773d7426cea2f70",
+                        "s" : "0x293c1c514b1eb4fb1fcfb7621f5d7125872bb190910cb2bb79633cfc4b66568d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1410g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1410g0v0Filler.json
new file mode 100644
index 000000000..1aae00a06
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1410g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1410g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610582606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2ccdc2a0ace01d319436f5ce2b1ffadf249cd2e78ce9dcef5ee217db46a18da2",
+                        "s" : "0x6b4305e9e5a8240553af5fa986f3ecafed1f253d90e2e688b53805a5dc7569ac",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1411g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1411g0v0Filler.json
new file mode 100644
index 000000000..50178b32c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1411g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1411g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610583606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x905ced637e3280788ba295afc920527d1af4ebb7c0a46cd4b59856cefb2abdd6",
+                        "s" : "0x6735393586b3de47dbe39a1e1db8f2acfa5916fcfddc2540cda0fefdd7b9071f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1412g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1412g0v0Filler.json
new file mode 100644
index 000000000..e7200ff05
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1412g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1412g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610584606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3fc73fcd52379d1bef6d0e09fab88b2f5057f72f46cd6cf5b91a8254a26b1188",
+                        "s" : "0x6811141a49bc1878966de4c2bb4bf3974287a8bdf73690b0ecfb1597058071ea",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1413g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1413g0v0Filler.json
new file mode 100644
index 000000000..5f5ae1949
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1413g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1413g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610585606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd5f030b2c0dd2b878082032daf3581a80862fe92ac6a4a9649766ef7a0e3bd7b",
+                        "s" : "0x0b146a5b390b1a1f52787fb8d3f9423e8a011367b392391e45592d69cb552ddb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1414g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1414g0v0Filler.json
new file mode 100644
index 000000000..20acb110d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1414g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1414g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610586606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbb16b7efaaccbd2ec9ed58e2a17664e0337571ce8b1d445b32d3e504a2c8b7a7",
+                        "s" : "0x3484d53c3827afd5bf0c129a8ac645643a9a2cd1c2d38473e83b3b0729c68b66",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1415g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1415g0v0Filler.json
new file mode 100644
index 000000000..2c7aed16b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1415g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1415g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610587606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x22bee7279c1d048f067a662cae4690d694edc20e29de1eb86b8d3122fb7556e2",
+                        "s" : "0x081a59593b785118885220142f39d7736c1405aece4e77a0637c84ea23f81be1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1416g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1416g0v0Filler.json
new file mode 100644
index 000000000..0b3940e4c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1416g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1416g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610588606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x92ddc3ca66c86eda0e923cb74ee64aa6a5781246d1dbc6f42d36173ffdb7393e",
+                        "s" : "0x14d4be5148245315ce79009c78e429f0124662bf19bf87189ea2543f84566008",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1417g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1417g0v0Filler.json
new file mode 100644
index 000000000..f2cea8b7f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1417g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1417g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610589606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x10babdf0e1781f472e2485bc8963793baeb328fbcbe0b7641832a09f0d63dd06",
+                        "s" : "0x5f090009a443a7c88d39187c549ef17cbf195e2f606118f4e84812d61e1a086e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1418g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1418g0v0Filler.json
new file mode 100644
index 000000000..55459a820
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1418g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1418g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61058a606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc2ea92a1f425b1bebc61e69d16952d1f55e7ad03026459a46ff1351c14421c2b",
+                        "s" : "0x6eea17eeb0ebef47413502e07d9fab0ded29b699295ffab3b92cf1e2da78b223",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1419g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1419g0v0Filler.json
new file mode 100644
index 000000000..a1d61014c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1419g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1419g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61058b606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x41459a53e68f51c7aa2c2b32222d2602d3d17cd1d0ddde758a6ad2ad53d4603f",
+                        "s" : "0x5dc35d4eaa092df1354ba6f51eeff565b9c79bfa3df2da2459059cb273307ca3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d141g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d141g0v0Filler.json
new file mode 100644
index 000000000..d2bdd72bc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d141g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d141g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x608d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd04ff9c1f6dc98654a9d605c471bd1b2000477cf6452de612237aee8d1939e1a",
+                        "s" : "0x0b8ab1dbada02bb6fbee3a76918e81fe7704a58fad356e4c2e555568884fc82b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1420g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1420g0v0Filler.json
new file mode 100644
index 000000000..0cde97821
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1420g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1420g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61058c606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbe83cc206dea9998b397fb80df6f415c3933fe39fb3053f5f6c614e2a4d855fd",
+                        "s" : "0x6ee139f3be585755bdad0dd3cfcb8148d372b81f02e059bc5659a342fcd62463",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1421g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1421g0v0Filler.json
new file mode 100644
index 000000000..0d1a7346c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1421g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1421g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61058d606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x29e820903d4ccaffa052f688e391dd80542d90eda641f621c535ce3dea91e109",
+                        "s" : "0x29d58323366e5d473a9e5f91ac01612a3757dc5d75a69bb54ce1d9b5978696e7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1422g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1422g0v0Filler.json
new file mode 100644
index 000000000..a9a7f17f1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1422g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1422g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61058e606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2f06dcff9b9b94d86d32a20080ec99a94ce4f40deeb21f2105ac5df84725b35c",
+                        "s" : "0x574859114751d439e32d9dee5c0c6a2a6fb5ad2762b49f812323fd367e5f3904",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1423g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1423g0v0Filler.json
new file mode 100644
index 000000000..1ae25e657
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1423g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1423g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61058f606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4807d8c248d373898af4b7e7f0d8122e7645133b9bb0df2c4264e2ecad7b4942",
+                        "s" : "0x7437d2d999d2567a8553dea61ebc5d29b93bad35e4ac5f615e5b5b6cfec6ae90",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1424g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1424g0v0Filler.json
new file mode 100644
index 000000000..be794a90e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1424g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1424g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610590606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0c880a3b6ae331b869edefda868cc8750adbe6a5aa72f95e21c2fc22041c3cfd",
+                        "s" : "0x2ef6f435f01411d28d5c4cf50777795721eef25d0310d6165d00a7c28afed913",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1425g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1425g0v0Filler.json
new file mode 100644
index 000000000..a76f49ece
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1425g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1425g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610591606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x07b69bc1bb89f48418a09ba0b8cf77563cbec7cb39d05a61c4d284e40077d05d",
+                        "s" : "0x70e0e6a3c1c31615dc09d05ba7a1fe617a70f095cf5f5de1cdeb456d74ee7157",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1426g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1426g0v0Filler.json
new file mode 100644
index 000000000..665563981
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1426g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1426g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610592606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb9753bbd5a3ad6e1217e17093157ecb28a19164117ba75914852c0ee0e5aed3c",
+                        "s" : "0x5e7d2aaa5346af0aea36ba73e6290496c02b6feef94e5d373e9410fd2217c281",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1427g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1427g0v0Filler.json
new file mode 100644
index 000000000..afeccc6ed
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1427g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1427g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610593606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2037de209b60bebb8af962d0d21cff02deb7770dc23300c9925621ccd565a5b5",
+                        "s" : "0x77cfb099c02e04e51c59c06d0f69171293c8caf92af94ef0abf45aa79401ac8d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1428g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1428g0v0Filler.json
new file mode 100644
index 000000000..77ed67455
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1428g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1428g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610594606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd6c5edbd837a9529871f0bb1bea58eba73f968f363f2a5145fffe5f0d91b661e",
+                        "s" : "0x26796f1c326a851492e1e00b1a85875198a2cdd3b40fa51abed38e984d82b7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1429g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1429g0v0Filler.json
new file mode 100644
index 000000000..e51568085
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1429g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1429g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610595606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xba9e3ec1dc777e804d941757af870174a58d36841ffb38c6f644422b60572b71",
+                        "s" : "0x41721cdf4d31cf24b0a264836a067a74cf832d860cfed5a2c854da07dee22254",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d142g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d142g0v0Filler.json
new file mode 100644
index 000000000..35598f1a3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d142g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d142g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x608e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x63de0b90c83775ff91b2a49b4cb1e5415d8605af226e1fd5fa4de7f1dec39fda",
+                        "s" : "0x184b57431226e86d5a159f761ec122dec7b71f07fe86e75085bd180247cbf840",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1430g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1430g0v0Filler.json
new file mode 100644
index 000000000..e6c4c1c01
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1430g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1430g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610596606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbf14bedba7b857b9722d0afdffe1943056cc17f6a923748caac136ccd8476e7c",
+                        "s" : "0x1a76c0bd5e2c48f15e78f729f990b74515e4d80dbc5758a428a9cf3725b029bd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1431g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1431g0v0Filler.json
new file mode 100644
index 000000000..c4ce07f82
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1431g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1431g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610597606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8a44b99712e1d179ecb6bd44adbe709313e976bb1160f82ad4826152c53a76ee",
+                        "s" : "0x6a46c0213b58a286b53ec9359a8ad0800aaeb11dbd13c568b5b405eec19653c9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1432g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1432g0v0Filler.json
new file mode 100644
index 000000000..a861ba56b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1432g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1432g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610598606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5d65a28c9699ec5dd476a7d326ebbc2f6f54084b47785f14f529cb6ae2b68dbe",
+                        "s" : "0x4842abd0c9243123217664e1cbe791a635d001563f55ceb3710cb8fbbe519e25",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1433g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1433g0v0Filler.json
new file mode 100644
index 000000000..71177e0c4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1433g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1433g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610599606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe1c736867b7c5153f977e38408d3f30ffca508811296cbe73ebb33362753ebb6",
+                        "s" : "0x65d848df4acef6f8fad3d6f922f1995b1ef9a231dc3ec7595dfd8509b685028f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1434g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1434g0v0Filler.json
new file mode 100644
index 000000000..422b551b9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1434g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1434g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61059a606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3b92617068471c7ac8c94fb12d642335304e01159815fc9930271835650d638d",
+                        "s" : "0x7fdf6cdd9080d68ecb0f4dff3d46dffe9d93bf002d76cb7bb218d72490af0d6a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1435g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1435g0v0Filler.json
new file mode 100644
index 000000000..30553d56a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1435g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1435g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61059b606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x504ea85b6e965a8975aad7b77b9ca190f18de006a8193c6a4dbf7cbbc8aee94d",
+                        "s" : "0x2d99d35b09ceb92eee7de24e397c80a9acbe4c630eba73263b68f0ac53bd9541",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1436g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1436g0v0Filler.json
new file mode 100644
index 000000000..c248abda6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1436g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1436g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61059c606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf7cf96473d3290e98af7725c2d5424c7638957b9b23915b63febf505ffc90393",
+                        "s" : "0x65b906312ae36c6ff0a06413064fbf427d58e99f29190fe305bbf80193f0ab29",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1437g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1437g0v0Filler.json
new file mode 100644
index 000000000..4d21df6eb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1437g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1437g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61059d606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d45a9754da7e60df6c192aa83ba3e459d5ebca0a37d543f8687040d74fb4011",
+                        "s" : "0x272cf033aa6cd1233197b7d4c897b924509dc32ba9aaebbf9d192ae5e752bce6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1438g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1438g0v0Filler.json
new file mode 100644
index 000000000..0f7cb0c46
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1438g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1438g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61059e606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3addf4c3dce30113ae3ceab0e5aa9a0066d3b95203385dff7ecb57cc8865bd4d",
+                        "s" : "0x7b6b0293418a6fb6755fb324a41d0704f2d0ee7ba6eb929ad1568f43f43bea43",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1439g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1439g0v0Filler.json
new file mode 100644
index 000000000..54ce8010a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1439g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1439g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61059f606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x405a323b7120acbe253cdb16bdd94ee515445dd96d074dd20087fe9214e5524d",
+                        "s" : "0x4b7199c0f13c5028f7277840db389845a5551e11ed54458cf5c4ee6b8782de6c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d143g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d143g0v0Filler.json
new file mode 100644
index 000000000..37d13d13d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d143g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d143g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x608f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf69035b5d6d795a42d8f4f5807d4be934a038dc696a7ba6f52dd87878922e778",
+                        "s" : "0x016105d46292f57c555c14cb5af7cc4ccd73631327962bc1ae45edd4a8f5a490",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1440g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1440g0v0Filler.json
new file mode 100644
index 000000000..67de38b20
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1440g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1440g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105a0606452600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5d0a2c56658576af50085ce4fbeec3f25b19af4cbd6f76d711cf8993297a56b7",
+                        "s" : "0x2d7027ef6fd52071c02969a8edbc668b63fd33fa16291d4236ba0e18e4549719",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1441g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1441g0v0Filler.json
new file mode 100644
index 000000000..719352d5d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1441g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1441g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105a1606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x63e19af5f7feacdca98661b5cf0e650a6467287a31f41d68e4e70263bc00797c",
+                        "s" : "0x64bc5fd8f62ee2f012cd4843f8ae29ed996543822826975699f6997e17f7b490",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1442g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1442g0v0Filler.json
new file mode 100644
index 000000000..9dfd0544a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1442g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1442g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105a2606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1680bf2a52fb791b2c83749edb5e4247116c7a5efc89b008e9d92cf58c4e9231",
+                        "s" : "0x6e14b5fd9167852833e2aa0806c893625f814688932c3ca68968aa15371b2a16",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1443g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1443g0v0Filler.json
new file mode 100644
index 000000000..599cc3765
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1443g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1443g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105a3606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x522c23d39809144f4464bb5cb5ca5a4d9c663d1a3d33f77848e535e2981b8313",
+                        "s" : "0x5f4b5397a54680cfc3a446b4bf7c5c07c7611639116c3785e6e5f4c4e2d3310f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1444g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1444g0v0Filler.json
new file mode 100644
index 000000000..6a8c982ab
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1444g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1444g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105a4606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2137b98d8f575d75e6f7dc313ce5befa76af77c2ddd94284a32309cf7f8bc3dc",
+                        "s" : "0x632e5d5a92c57c0311d2ff81e9721fd23234a2760452326fd147f307428d748e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1445g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1445g0v0Filler.json
new file mode 100644
index 000000000..461ca43cd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1445g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1445g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105a5606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7413b76bcfd2fc2d39b0d3777eec857f3544e89d0455850dac452b9e3017d2f2",
+                        "s" : "0x7e4f5600000e41c49a1b81643fd63abb36134c3d7be6a8e258e23e513dfe567a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1446g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1446g0v0Filler.json
new file mode 100644
index 000000000..24d08aedb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1446g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1446g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105a6606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1e779e2c6f1d899d9385cc3150339ee64457ef293822b0a666a371b9bfc107aa",
+                        "s" : "0x7fce13e177c028eac722f69e1659cf50c8b187a72ddf4fe8f76e327275dbf314",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1447g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1447g0v0Filler.json
new file mode 100644
index 000000000..ad4931ee3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1447g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1447g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105a7606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x28d598fd663dcdcd4f7091aadddb337d49a4eeb30ef782cf799208ec8fb0b2ff",
+                        "s" : "0x053615430882fd741a1c44407d501780b9627eaa946cbfd7f0d92637c2c58872",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1448g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1448g0v0Filler.json
new file mode 100644
index 000000000..f791c4407
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1448g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1448g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105a8606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8f830dcb93ed49d0012b0feebadd2d1214ae4ad79d5ba1be53de7fce6c2d0ffa",
+                        "s" : "0x7f00cd960fa680c6d183e8594389351a838a3567f19564ef86b1b2e84ab01f01",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1449g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1449g0v0Filler.json
new file mode 100644
index 000000000..a5179230a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1449g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1449g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105a9606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd2f2a00add3b01a9714a3928e2e5d93543a66ae67dd0972a5b5497e29521fc0b",
+                        "s" : "0x36071eb2fbc94d7c620d16fa71c8484c88122676b33cf2d1cf51406963cd436a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d144g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d144g0v0Filler.json
new file mode 100644
index 000000000..2e4793802
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d144g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d144g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60906064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfb669ded86ae507ec4dc2b83a77d2a6bfcef27631b5708b247c86409dbea0952",
+                        "s" : "0x603257b1e796bb1c04e09670c517772a9851bcb43c6c239470d9003ea9fe6963",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1450g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1450g0v0Filler.json
new file mode 100644
index 000000000..e6fdcbbf7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1450g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1450g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105aa606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xccfbcd53e0f42402641255e8ff5ccc98e54ecece7454aaaca294771821a7146b",
+                        "s" : "0x54d6820d15a54ebf07ad23c251adca747b9c7dd8c45d7a9144b8d0ceaa120d80",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1451g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1451g0v0Filler.json
new file mode 100644
index 000000000..e884cf281
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1451g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1451g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ab606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa308134a1617c4ad5ded1924faaefac90009cfd8e898e915cc5f6049b016473a",
+                        "s" : "0x06e9f9d71a42d235330e83dc251a9a888b1fdc8817844f04c22a412719849f7b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1452g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1452g0v0Filler.json
new file mode 100644
index 000000000..f4ef98c09
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1452g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1452g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ac606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf5bca1d6ed0677db9de223adf5e6976d8d0e11fd292f7c103e55d03c24b6f9c4",
+                        "s" : "0x5f5925a5732c27001f150d388d0b51d19ed09e0de633ebc667747c3d1ea4c7d5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1453g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1453g0v0Filler.json
new file mode 100644
index 000000000..2d469f4ac
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1453g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1453g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ad606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xed82ad0386042c5058247fe4969813b8536a1a008c5772f8289f63b36996b8e6",
+                        "s" : "0x78890795584f14e907e0357cc0b493ffee8e6c43eb1a9cfbe6bdd63d098836fa",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1454g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1454g0v0Filler.json
new file mode 100644
index 000000000..c736f3db3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1454g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1454g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ae606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2c18056c4b06bb1576803ef4ff275e4f33880d5cc26ba2225e5eec9a9f262c68",
+                        "s" : "0x782d2a717ca4da756818b2273580daf3cf12cd359bfecbb72d2286cb4517464f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1455g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1455g0v0Filler.json
new file mode 100644
index 000000000..9393326e8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1455g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1455g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105af606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1f17b7f56013fb4632be76e3a798fb58dffd31c5e9ae7b1982fadb1d50788fa9",
+                        "s" : "0x3cf00f3128078a46fcf56e4225af27f9e77d606d7aac13c4439b6bf364c1003a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1456g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1456g0v0Filler.json
new file mode 100644
index 000000000..2cc62a8ac
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1456g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1456g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105b0606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa10234931a31ccb11f86a3d4c01db78a9b14a231bc6b4d60c2afc5871b190fda",
+                        "s" : "0x69f626953cb73ab1e04a2fab281143a733fcdd0367b949849d214bcae7b744c7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1457g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1457g0v0Filler.json
new file mode 100644
index 000000000..15141c929
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1457g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1457g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105b1606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbe7cca792a0a9b0900c572d1673911f0926a16aab93decbe9ad6d733f4adb5db",
+                        "s" : "0x0c62b32ea4ddd382869d337778e2f88bd2aed361fac4aba10408690c74be8a47",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1458g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1458g0v0Filler.json
new file mode 100644
index 000000000..d2885d364
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1458g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1458g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105b2606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb2998ce6b8becc4e2b8ade3f5d7e4525a1ff546c810f9721b291f702f871d4f8",
+                        "s" : "0x49f8336027e6777d891bba94910905bb807ece35a231d335365be066211a0131",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1459g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1459g0v0Filler.json
new file mode 100644
index 000000000..56feb0948
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1459g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1459g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105b3606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf55820961a842ce0e1749a8138ca87d7892d59a41971da6814cd8173654770c0",
+                        "s" : "0x6bb3b5c7db2980bfe41d2dcf642f795b5039b1d69d4db85ea562786819518d9a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d145g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d145g0v0Filler.json
new file mode 100644
index 000000000..a1561c86f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d145g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d145g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60916064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa630298cc630c39a16887b1090e80a1964cd0e8f666188f756af9e1c3c4ff4d0",
+                        "s" : "0x4dcd62468d062f0930fba7b2b1bdbc889e68c9d24f2ff21990e36f4db39db109",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1460g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1460g0v0Filler.json
new file mode 100644
index 000000000..fe5806504
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1460g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1460g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105b4606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x57b78b0ec9acd64489a85b40193ed906c07bb203498ad26bdca2903ba06e9116",
+                        "s" : "0x5cc5e4abe02b0a265fca71690a628e8278d7632dc6bf8bd91ac4e25a5e44fd06",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1461g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1461g0v0Filler.json
new file mode 100644
index 000000000..ce3a20bc9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1461g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1461g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105b5606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8c0d583e6603f5301ae21d61e003fbd69654f92a8c618cdc4cb0d68d2e34acd1",
+                        "s" : "0x51b23ed2f4ae8c19ce43efc58df697687886ba18c92c466ae1f228795cbb2be5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1462g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1462g0v0Filler.json
new file mode 100644
index 000000000..3d0b84601
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1462g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1462g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105b6606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x515548876492732ac4411abc79ddb39ae7849992a885eeb6cb7781aa82e13aab",
+                        "s" : "0x37e7248021fdfe9869dad596e7a86d316bbf18e33e4d8ed68ea0dc96ff1ddaa8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1463g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1463g0v0Filler.json
new file mode 100644
index 000000000..5a2a43437
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1463g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1463g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105b7606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2b464330f41d9510a79d9a150f1aa9b667792354ca11a0ea7edb2cda57ec72c4",
+                        "s" : "0x6e8e4f81837ad16763e1cb8944179499d140e268475b3ce0b52a4161b47beeec",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1464g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1464g0v0Filler.json
new file mode 100644
index 000000000..839294c56
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1464g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1464g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105b8606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf89580679249fe9be21abdf9079b2cde5107948071cccf527bf5fac1cdf99b23",
+                        "s" : "0x5af0ddf729f7f2de64d72dca21fd2fb7df5f83356491f8a22565edbf0eff9cfe",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1465g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1465g0v0Filler.json
new file mode 100644
index 000000000..81ac57af1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1465g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1465g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105b9606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa17430f1d898ab1a5d5f61ffde2255c01c37193d7e084e38fdacd29ba33eef8d",
+                        "s" : "0x118494002f5d3387977ae6583ad183ceb068cb289f766d4273181bff68d98cda",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1466g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1466g0v0Filler.json
new file mode 100644
index 000000000..b18fc779c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1466g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1466g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ba606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcaa5305713769c3e0aa60ad58528ed02182f694902dcca362bf15d75f568d15a",
+                        "s" : "0x4ec307580171cc378e51747800183a543d7e0a8b2bdd25b560ee9e785ea028b9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1467g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1467g0v0Filler.json
new file mode 100644
index 000000000..ad1be24df
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1467g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1467g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105bb606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0a9ad55cbe5fbd264ca8fdbdb21d5d81c6d11a775f9bb2564b617b1f240465d9",
+                        "s" : "0x7b04ad133ac9c664a30c8e6ba13e3ca127d6916c3ea03af1dcaa1f804b3256dc",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1468g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1468g0v0Filler.json
new file mode 100644
index 000000000..a29ef399f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1468g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1468g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105bc606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0b006d9f34258d20c1298d68117b5726365feb278d22331a574988d5484769da",
+                        "s" : "0x6b7c1378768e6f49e3f3cf0bed3c3facf628d2bb9c87cdac09c4d76c4f09e29a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1469g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1469g0v0Filler.json
new file mode 100644
index 000000000..cc9776bd1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1469g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1469g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105bd606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x67ddfa07948df885365ae76ad7519dd9d1cfb40f0f12f8984a139f426189493a",
+                        "s" : "0x55039c3195899ea8da1db76b4b6a1d51dc5f72c366263a09e331d87b78ccc3ac",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d146g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d146g0v0Filler.json
new file mode 100644
index 000000000..c2f4dd13f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d146g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d146g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60926064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0a6c8ec70116534d1b0935f74ea9322dd36a42c8d18e79694c9d2eed7850690a",
+                        "s" : "0x1029f4c046eaadb52361ad5fe6215d63a681b067eb50fb68bb59b7e83b645271",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1470g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1470g0v0Filler.json
new file mode 100644
index 000000000..763698f6c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1470g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1470g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105be606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd5450960ca01a5866b9e42022a943da430f4b5baf5d8205091b69494eb632016",
+                        "s" : "0x58026c595ae6e7763f124a921e8b76287491a9536fb8ca2111c8ce6d9e1ed5f8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1471g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1471g0v0Filler.json
new file mode 100644
index 000000000..e70600c25
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1471g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1471g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105bf606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc489bd5a41a3242f2d215f13a8d613b0d458199a40206b3e1a1a88ef35566dbc",
+                        "s" : "0x23e7eb493a3c7dc1415c0653efb4cfb766bca26c73a19662ec733d65250eb69e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1472g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1472g0v0Filler.json
new file mode 100644
index 000000000..530a50c8d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1472g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1472g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105c0606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa5ac50ad2853a40f20da2834be4d67a32e3930185de79e49825b2ec4ec640fff",
+                        "s" : "0x5bc0e0c827619a96731f2926ff453e43b017dbee4ebe5a6dd6d64f3be5152994",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1473g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1473g0v0Filler.json
new file mode 100644
index 000000000..807d9f8ce
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1473g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1473g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105c1606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa465d84f8c1cece406eb81ae3b8aa12794352bdf2d49c04722766c4cda67b6e4",
+                        "s" : "0x20348c9a8458e3be18ec578e76b8c8b432e25cce467f2cc2cbe8bc1aac71eba4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1474g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1474g0v0Filler.json
new file mode 100644
index 000000000..44c4c6b07
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1474g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1474g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105c2606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8b5eb1af064cb8d347a12d78b60247c2a6c3be9992bd088b62f1f3944272cc77",
+                        "s" : "0x6d8344d4ce879129a30d3b9ff0d20aac5f182ae0c99dd1609571b9b2df01c707",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1475g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1475g0v0Filler.json
new file mode 100644
index 000000000..3599bb7ef
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1475g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1475g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105c3606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaba7be0280b64e9d0671cf19c191eb66b315da6d9bd0b172505f7261a9aae684",
+                        "s" : "0x2fc20485ea1894c1db5b0d5658b70026febf750cc9aba6afbbab29280c7b9382",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1476g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1476g0v0Filler.json
new file mode 100644
index 000000000..8cfee1b6a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1476g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1476g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105c4606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7516e2174b4471f9fbfbf14302a3f0cc10d49202b084c1a54683297dc44bf60e",
+                        "s" : "0x7f3fa89987a6355b551d4e7609f5cf7cc8565a54cee33603c9b1327cc2748849",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1477g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1477g0v0Filler.json
new file mode 100644
index 000000000..e61d44593
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1477g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1477g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105c5606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x93e0d77968e79fa357abd06458cf07a3c28b8c19e5a7427f4c112e8bc8eeaca1",
+                        "s" : "0x31fe5bc4585946b767923cd343e53dcfc36f9a378be2683f9c7e7e364c55b8b6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1478g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1478g0v0Filler.json
new file mode 100644
index 000000000..61107a2e2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1478g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1478g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105c6606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4b31d82aaa38274a175306fd1bef0614cdbf47e162334ee4b70e05388d56a3a7",
+                        "s" : "0x73bc356ef93eae31f74c423197f83908150c399e58ae2c1b020b36271f4921ea",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1479g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1479g0v0Filler.json
new file mode 100644
index 000000000..7027e2955
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1479g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1479g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105c7606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7274764f27400eb5d17da51e8e64443c6889cc8ae413fb1d2f7afa4546516628",
+                        "s" : "0x7db5dde6bd5cee874a776fb35279f7ebfbf3a140a2bf74f59c6aa4c60f1320ab",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d147g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d147g0v0Filler.json
new file mode 100644
index 000000000..fa28c8930
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d147g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d147g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60936064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7d4e7ccd37877b5d827649eb89366935a6c21b8e306dc99a00dca00bc1f1759b",
+                        "s" : "0x5e1142f2a153739f8d94e9184eed3a250969c4c04ae26ef46537767631a78589",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1480g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1480g0v0Filler.json
new file mode 100644
index 000000000..d3d276a5e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1480g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1480g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105c8606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xad458616597d22f10acc49da4bde1cf6b954f631ca571c149d74a131e8b4fefc",
+                        "s" : "0x471b7f49f030789915d25224248940c9fea20afa6254bcca4851adcfab3a5193",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1481g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1481g0v0Filler.json
new file mode 100644
index 000000000..60d16bdec
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1481g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1481g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105c9606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x704e3a22648154752fc9b7829d5fccae0676adbb1727330c2b61e4d8545b924f",
+                        "s" : "0x3bd2fe740f2b1c0f41c22dabdf2409dba3f75488c5cf4554e78b2b3063be3101",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1482g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1482g0v0Filler.json
new file mode 100644
index 000000000..b62b23634
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1482g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1482g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ca606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x041c12bac5277d2001e319bd37453fa8cb888c94f6b80cde383206642e5f7293",
+                        "s" : "0x039edc21a8a85e67908fb9e79502350ce31e169826a419f5613f56d2d6bfbced",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1483g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1483g0v0Filler.json
new file mode 100644
index 000000000..7abcbdb00
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1483g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1483g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105cb606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2ee07a4cc21941dc07beed9e728ee674e1884f75bb4aeda2f6f875731f10ebee",
+                        "s" : "0x27e9ca62539e8fe1a3d55cb01a11797dba1ba1730301d173642d6496472e9b35",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1484g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1484g0v0Filler.json
new file mode 100644
index 000000000..e900e0423
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1484g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1484g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105cc606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7a9689a3685b0002960ac0fb6d2f74876080842f921778dff0193accaa70a43b",
+                        "s" : "0x04a15fcc28afa6c67d43606e312269fc58f27ebccbba209c2c01b2e27384ed63",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1485g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1485g0v0Filler.json
new file mode 100644
index 000000000..5ed04c385
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1485g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1485g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105cd606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x192e3ccd58c6611578b00e15920270678a8b44ff83abcc4dfce56bc3938385d8",
+                        "s" : "0x0fbb5433f4fc8b2f943f6cc7f06172f7cb04b14c4d8cc984903cf39f3053390d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1486g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1486g0v0Filler.json
new file mode 100644
index 000000000..fd1ce4979
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1486g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1486g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ce606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4eab0a4eb31b26cfe0b111af7ddeb679b09b0d5eac39c90efb8cc88ae06c1cb4",
+                        "s" : "0x6541f360e952e7942dc0774dd8977a94660a2f9611e62f82f84741540f45e6ce",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1487g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1487g0v0Filler.json
new file mode 100644
index 000000000..3af5b3179
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1487g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1487g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105cf606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1632bb6131a0c9a15ed8f8cd6c86c92e64a43af20f159aa47437f446a76bc1dc",
+                        "s" : "0x19a0df63001e4fce8045313fc5c4525441852f4caaa8766f130612ca3a008e3d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1488g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1488g0v0Filler.json
new file mode 100644
index 000000000..b7687320a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1488g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1488g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105d0606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x21031cb0cb64707a8710d5079689605c962e23162ccf442baba77c24780c588f",
+                        "s" : "0x7d3df51c2561c9fbd374b5bac1d000db956f40d94a8ce8a8ea2a0ec1a5ece28d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1489g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1489g0v0Filler.json
new file mode 100644
index 000000000..a34e684c4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1489g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1489g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105d1606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x41b7def5e06a2f3d905baa8181606c139638081c9743f4d7727661ddc6db35c2",
+                        "s" : "0x3b5a6746a3cfd158d73725b2580ca864c7f240496d6f924432cf36b7b05c6717",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d148g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d148g0v0Filler.json
new file mode 100644
index 000000000..3b16ae741
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d148g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d148g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60946064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3323e932bc63e7f99fc1d31883b1052bf2ef6ef247c1266cefaae02dfa42d216",
+                        "s" : "0x5e29027b206aa254cee34a606d16ffac81f041fcf484958187bc8e35d738d6b9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1490g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1490g0v0Filler.json
new file mode 100644
index 000000000..532868b4d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1490g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1490g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105d2606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0464e015480969353b95316a06cc0b0bb7eb68117cce4ae5be220a7f80744bf7",
+                        "s" : "0x458ffe76350dd62dfd7f0ea0719ce4d59c9bd6156423fb5d5e148c9acdc42efc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1491g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1491g0v0Filler.json
new file mode 100644
index 000000000..189d61693
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1491g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1491g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105d3606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaa58e191ec61076d28f4b7fbd9a0248e6973b65d184edb10558d66d2884d2dd3",
+                        "s" : "0x1835374b21b7fc73d00866c873db922a6506cb9f6fcd6b9179aa49270ede39a3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1492g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1492g0v0Filler.json
new file mode 100644
index 000000000..ce2db1188
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1492g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1492g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105d4606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfd43c66530bcdbdc4edd7062d8eefc46545662584600338ebe63e3c472d946e1",
+                        "s" : "0x3acb6b8b0a2d5b6ca387ab1e481b79248a94ae1987a6b93c2914efd5fbd56332",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1493g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1493g0v0Filler.json
new file mode 100644
index 000000000..bad0b30cb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1493g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1493g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105d5606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6bc57ee44e61c87a15af8be5326cfeb9cf60bce7a14f13c9b1088ad24cf7763c",
+                        "s" : "0x0b3a727b0d6cfb519a1db8f48a7d584d40e34acede299de28349bb16ae8844",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1494g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1494g0v0Filler.json
new file mode 100644
index 000000000..6ca0382dd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1494g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1494g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105d6606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x384a31993366ce9687facb399df041a1fb4bd645a4df457388af9c71f15cf0e3",
+                        "s" : "0x124b806bdf0623ca2803028c8ea7e892bca1a98debeec3a9df2623c45e5defaa",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1495g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1495g0v0Filler.json
new file mode 100644
index 000000000..01c8320d4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1495g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1495g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105d7606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x027d7676a7a6d622b4eb8c6ab6ffd674e30de48e87d7da76eef32e7bbb698f9c",
+                        "s" : "0x2862cd4bc46bf5e9400bbfa736b5f1d1b0f361dd90677264e4a835a923c4319f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1496g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1496g0v0Filler.json
new file mode 100644
index 000000000..ba56b1ef3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1496g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1496g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105d8606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4836f5518c77d812668cf6a6a0cdf4fb27129e2ad7af816cf4d3665a728962d1",
+                        "s" : "0x132c21c97bdd0e4951147f17917e30bafc95d5b3d34a23a7f10fde75110c298e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1497g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1497g0v0Filler.json
new file mode 100644
index 000000000..2c882b4f9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1497g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1497g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105d9606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1d97332338d8b0b72e86a4d386cee2239746501a24d3eac5e45f90b297cad9a7",
+                        "s" : "0xf1360556f6f3f7c23912c70630097eeb6eca1d8f047ca022d6887df17e5ab3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1498g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1498g0v0Filler.json
new file mode 100644
index 000000000..882f08869
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1498g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1498g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105da606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3db9490d607434a13e9a5be45e029b2558b19bb346490f2e16acb121fad7be18",
+                        "s" : "0x0d2afe4e8296a3e8aa05fb7e6b1fa37caf57a2cb45d9c257e527dd08439ff49e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1499g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1499g0v0Filler.json
new file mode 100644
index 000000000..38d862ada
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1499g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1499g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105db606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb18a09d05ff08075eaf219b9a0580112229e4b974995c1d1963518d4f0242df6",
+                        "s" : "0x2cbcfb2be89a99f60e98608c1a22d538603f10d19699bfef79ab6eff8776db15",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d149g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d149g0v0Filler.json
new file mode 100644
index 000000000..8c6c9bb8e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d149g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d149g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60956064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x46662f81bb58294369d2e3e24e3318833b8dcc410f76e73be66954261902483c",
+                        "s" : "0x58fb08d02b90f6186dc7a864dd4a0c1fb8c143ca3e607d95d4904dc158525c39",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d14g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d14g0v0Filler.json
new file mode 100644
index 000000000..aa9429f0e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d14g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d14g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x600e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x34fb583ce39224ca885f82d0aa478b7bc5ed20790bd52d34b1193494733982fa",
+                        "s" : "0x3d87644fe77ee0b04ce35de6077c335b86071cce060745d7410d2104e64792f5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1500g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1500g0v0Filler.json
new file mode 100644
index 000000000..c5d0ff9a5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1500g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1500g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105dc606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc8653ad66cc5ab5820d5e64e59a8ee6c2fb063a8df52d6c42c8f5813fd1287c0",
+                        "s" : "0x660d4cf1cc1fda2ce4f59ac0260f72d940032a2f30a50daec85ffda88649ccbd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1501g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1501g0v0Filler.json
new file mode 100644
index 000000000..518345f56
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1501g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1501g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105dd606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7f33414709df3d2bad833b520d655a3a17feba23ca5c20cf9091a3ef3631ec7a",
+                        "s" : "0x7caec9202d307ba07f31df5d908ce392fa949393f337ff9d81d737b1d5c34be2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1502g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1502g0v0Filler.json
new file mode 100644
index 000000000..66ea39b90
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1502g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1502g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105de606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x50d56b23e7d8138340c91ed0540d10e73520571ade70c0b684082a0b18c77590",
+                        "s" : "0x282804213f8a41e6e0fd61d91432dae48433508488a216955dbb91418eca99b4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1503g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1503g0v0Filler.json
new file mode 100644
index 000000000..828db689c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1503g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1503g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105df606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xef4268012fcb14a9d9a88857d9f98b22ad5844166f47aa14a7217577c7630402",
+                        "s" : "0x266a0f236845225a7ccf919b35e5e45c43b043305430899e620eee4a0598a20e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1504g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1504g0v0Filler.json
new file mode 100644
index 000000000..700fb8f23
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1504g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1504g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105e0606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x452e2ab970b7a56d3733b25bfd51821e2243d2a496581ab94252f208dc9b21ae",
+                        "s" : "0x2f441dbcd6bda323a2e55e07e858fd147a2a0b38b112a7e514bfa748079555d9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1505g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1505g0v0Filler.json
new file mode 100644
index 000000000..e8a6768d0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1505g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1505g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105e1606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2f98dd3f2ea65402c68b1731e5c6bf9717e8c4e0b93a0f50fa4dccb1a3000b60",
+                        "s" : "0x3978b4877f00ed0d3103aa500d8e53f6d1d7da1b1abdcb6a86863b01e31c1c15",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1506g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1506g0v0Filler.json
new file mode 100644
index 000000000..dddad628f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1506g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1506g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105e2606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x60a5f6918cb785a914c465837b1014fff02b27d09c2339d6c3acf31125817202",
+                        "s" : "0x2c99d58e6d100da8ff89b860b7ef6512da3fcaa8fafba1ef3f55f9a941a485e3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1507g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1507g0v0Filler.json
new file mode 100644
index 000000000..7e6be8d0f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1507g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1507g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105e3606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x805750b5a5c50052dfaf8297bda392c9a3ccbffbd624c9ae481cf13ada02bf2c",
+                        "s" : "0x134d9b38e0d84cd0b39c9163d715cd39be475c087c1ae53213f52b3efed91e90",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1508g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1508g0v0Filler.json
new file mode 100644
index 000000000..55715b1c7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1508g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1508g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105e4606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf5ae31141845c5794ebb38d0ba696e946a8686fee909cf58622c8bd4fd2ce9f5",
+                        "s" : "0x73c95dac34f35f5c9f36dffb189a7674d11155730b66552c8953a23811a2c49c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1509g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1509g0v0Filler.json
new file mode 100644
index 000000000..994e65e9a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1509g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1509g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105e5606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe31b3eb07273765b6e3f54d77dde04f92284c06b45fc91508e2d88d692a62682",
+                        "s" : "0x331578dd3cd73231867b033ea08977af95a59575601ed2b3ab405169333bc9d2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d150g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d150g0v0Filler.json
new file mode 100644
index 000000000..3ed6cc15a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d150g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d150g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60966064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd0392e8ebb781f89b24ca02b682deb561748bd4ff8a52bedad12a0f5fd8a8dc4",
+                        "s" : "0x3528a7e630c5b5b9c5fafdf680b40b0985ee24a1452ca06dc71ff5df0a5e7a9c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1510g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1510g0v0Filler.json
new file mode 100644
index 000000000..be5901b1c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1510g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1510g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105e6606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x03e661d85dc61707f423e7b49f7df75bbd6741df692665c89dc1c5ff4d132bc4",
+                        "s" : "0x7be38d5444bfa54c6f5b694fc6d9cf27d263f77f57be697832192f6f4917b609",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1511g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1511g0v0Filler.json
new file mode 100644
index 000000000..27ac6cd60
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1511g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1511g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105e7606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb3f74a5e6f1612fb2a2f65f0eff8360999040e41234a02ddbec67a88c56d96d0",
+                        "s" : "0x404fb5b572cc0141e5fb7b3f7c769fc9b04f3a5c2c11131e58ac6cdae35ea68d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1512g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1512g0v0Filler.json
new file mode 100644
index 000000000..c8b30cede
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1512g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1512g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105e8606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd6ef080aeebe10a3393714ac67d98dc189e6a733e4816899ca67942c5c8569c7",
+                        "s" : "0x577336aa413626c02d487d21a58b401653ae563454118a5d772a69e107f7da17",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1513g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1513g0v0Filler.json
new file mode 100644
index 000000000..d0ebacd30
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1513g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1513g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105e9606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb1477b7f45eb6d11f043b70ea3d71cc36704866d0c9c0211da7bc0b79ff28afa",
+                        "s" : "0x42273b69ea625d34a77a3240194886161bf9fe65d97820acbfad7c5c715f7546",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1514g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1514g0v0Filler.json
new file mode 100644
index 000000000..712060eaf
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1514g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1514g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ea606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x535789aa0891aba14fd6c2cf4fdf5acc6b89f26b726378c9c88c34791563690b",
+                        "s" : "0x4af40b36b1467be9da27e15bb069a2ff71e72697f21b07459945ca9b9c9d335c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1515g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1515g0v0Filler.json
new file mode 100644
index 000000000..23a0523ff
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1515g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1515g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105eb606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6dd2adc749ddc011cc7fec64b7e0551f2da7af3fd5d3a83a9d23f7a544d7f97c",
+                        "s" : "0x0306218e0a4a4228ece6f45183a503f55113f788fe68cb3054028b8ecbaedd76",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1516g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1516g0v0Filler.json
new file mode 100644
index 000000000..b94875a1c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1516g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1516g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ec606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x464b44c4ee184e87753f935599ee0140903781599fe1c994c34d0a7e52bf01c6",
+                        "s" : "0x581bc3b83ab05b06e383f4956ee1767b750ff813f5f1c7733b883dbc7132a2af",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1517g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1517g0v0Filler.json
new file mode 100644
index 000000000..075b3843c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1517g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1517g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ed606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcb404dfd55bf9f2244124874d234489bb0ccc85df554f6fecce6da3ae49e405c",
+                        "s" : "0x1bd56a2e2ab421cdf7bb85af9378df1bb4766aec8d8c355ab9347b2fc5b945fd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1518g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1518g0v0Filler.json
new file mode 100644
index 000000000..04e6a5b7a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1518g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1518g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ee606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeb21702b5f8b81097cbcd7ada0c8dcca4abc232bca136c27bdc7efbdcd676bfa",
+                        "s" : "0x08c3ac7c2211ab18aca6f68b98c0c33b1320ea5d67f59e96deb8a5a673c411ea",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1519g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1519g0v0Filler.json
new file mode 100644
index 000000000..f7a8873eb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1519g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1519g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ef606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc0c03b08a66bdb7fa42f48a94096bd61b9b629323b80eefb51a3b563a885e3db",
+                        "s" : "0x26fdb6a627a063ee4b163daf029e848e08504cca8c6e15c2e7d2c707bd57e653",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d151g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d151g0v0Filler.json
new file mode 100644
index 000000000..028aa4131
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d151g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d151g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60976064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x30c4b7ccd81a3d7058d0d898789739ba575c6f42ab7f613321aaa29897ba9b2c",
+                        "s" : "0x7dfd4ff3219b4e00a85312f1a747252746b080feb11c2ec8142dd69029ad6729",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1520g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1520g0v0Filler.json
new file mode 100644
index 000000000..827e77b19
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1520g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1520g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105f0606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe6456251f810db3289a35bac7a136118dafeb3c3d4e219d2d49cd8b8040ca32c",
+                        "s" : "0x6c358a51bb9492c4d9bb7a0f0e756d2e4afc5a538e8737dde719fdf3f1bbc502",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1521g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1521g0v0Filler.json
new file mode 100644
index 000000000..7cef781b6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1521g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1521g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105f1606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x213ddf1552696a7d0ecedd124f2c7e124c8554ee79f04f0f08e60c3abdcc1cb2",
+                        "s" : "0x48e8216a2e02c15d50e20df15c9c0c32485770791c1542672795c43f6d307a87",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1522g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1522g0v0Filler.json
new file mode 100644
index 000000000..03337d1b2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1522g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1522g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105f2606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x70add850231966b851c25b29742d14f241914c52e5b46db8c1ffa3e8fab61e20",
+                        "s" : "0x552b78daa483ea9d7346f37a0c68bb2b436e5281424b9a57d88e4105efe8a14c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1523g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1523g0v0Filler.json
new file mode 100644
index 000000000..0f4a46764
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1523g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1523g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105f3606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfbf8f4704080f85315e57a3e7cb16d4cc8f3ff14f4b7896162873a411c90fa18",
+                        "s" : "0x0884dc8812f9a70ce877774ce1130cf9a082b7c068d75f2652815342b815d434",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1524g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1524g0v0Filler.json
new file mode 100644
index 000000000..19f67a002
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1524g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1524g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105f4606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa14f249926a2d606880e5e15b4da95889a2d254db2e888b2d38cbfd2b199bab2",
+                        "s" : "0x6c396824160fb4a520de68fd11f6362500456da6219ac9fc7c5059cfffe68ca9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1525g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1525g0v0Filler.json
new file mode 100644
index 000000000..b880cc352
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1525g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1525g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105f5606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaa31ab41da43d94892546800c04a964af9fa65be4fc84dfd3744d6e33772a28d",
+                        "s" : "0x2eefd094045ea7d2c8ef16be339a02fdb347675af2f544721cfee4e4d80b9863",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1526g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1526g0v0Filler.json
new file mode 100644
index 000000000..1c92b7dea
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1526g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1526g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105f6606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd7af70c69b6b2d38f01bb8e80c8b64b8cddb7c010d4234214c62ead0874ebb92",
+                        "s" : "0x4272678efe73ca006864f2b190a9b24fd499230129df9e95b0defbe242e96f3e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1527g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1527g0v0Filler.json
new file mode 100644
index 000000000..3cd803ce7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1527g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1527g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105f7606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbabcce09bccff0579dfada4e1aefdc9764778c4ffe151944a94edc29b0d0366c",
+                        "s" : "0x40f17535a9427986caade892bd458db18753626dd4444598617e36072c1cc218",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1528g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1528g0v0Filler.json
new file mode 100644
index 000000000..989e177da
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1528g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1528g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105f8606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xecf05a38cf0ab491664d010bf9984eda18f8376f9f334b644de303110941cb91",
+                        "s" : "0x7c5a02f7a9bcf0f01af5512cc13ba1d2360d58de6a2935c3eb29c669f8a15918",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1529g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1529g0v0Filler.json
new file mode 100644
index 000000000..072fdac9c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1529g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1529g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105f9606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x43348120d8a4beeeed5cb7331be97a72df7baafef0e3b2e1b5e48e40b3051d57",
+                        "s" : "0x18b70f49c2ab953563fb0b09b1045253cf3a4e437577f6dab7aa364b9b46131e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d152g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d152g0v0Filler.json
new file mode 100644
index 000000000..ccfe81f6c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d152g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d152g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60986064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x968027f1000033ae76292ab8685020c9ce891e2096a1c778bb1cbdf48e49196f",
+                        "s" : "0x7db760f22be0462ee7a1603a1daf563ed358c8cdb99c3b93c575b511ab765ecb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1530g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1530g0v0Filler.json
new file mode 100644
index 000000000..aad7348ad
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1530g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1530g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105fa606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x64f223b488bd5c626938fedbb4b69a8a8698e0a7eea4f4974c7531d1ff457a07",
+                        "s" : "0x1dfb4f51d4b51cc9703c861212c32a2049302367ff07725759e2f94a3275b9d7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1531g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1531g0v0Filler.json
new file mode 100644
index 000000000..ffde79f5d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1531g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1531g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105fb606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x554cc9c2052e4d79c296afc710151f23822736f818919aa098fcb6e84de9d19c",
+                        "s" : "0x1e3aba4b7d17a84f057a5a923308bf1a460d24ead4c83b1fed0afe557fddbb96",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1532g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1532g0v0Filler.json
new file mode 100644
index 000000000..5b612cfac
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1532g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1532g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105fc606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc86d0b43747897d31027a35b5b9ded9458cd9699997d2b08db0e4ac16f618cb9",
+                        "s" : "0x4f4a06768e15c364c980a59a385d74272fee8ec4fbd338563cd2a1222f26e69e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1533g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1533g0v0Filler.json
new file mode 100644
index 000000000..b5ebd7297
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1533g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1533g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105fd606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc7c41a94adbc40f08d909c5ab9e208b397fbb11204f2dd69dfe7462644d66a80",
+                        "s" : "0x58e77204f4338ed89bb04507222d0478feb981fa11e45d8b6e260aa6cfaacbac",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1534g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1534g0v0Filler.json
new file mode 100644
index 000000000..3ce134609
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1534g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1534g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105fe606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4654e12594ba016dd734ac43ee63eb24277f95752600c21b098f2eec02c1363d",
+                        "s" : "0x5aab0ae28d8f1f87b213525db3ee27603b0346de1a514e487ac760ff6eefbfd5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1535g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1535g0v0Filler.json
new file mode 100644
index 000000000..3caa5d25d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1535g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1535g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6105ff606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb6a0e6ac054f61aa7528ce13ec9e912fbb044e887d9cfd139adb8e85b70620f7",
+                        "s" : "0x2488294dda5517003eecf804b74e0c3d93cc90274ff588a3e3814fe5c0078ddd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1536g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1536g0v0Filler.json
new file mode 100644
index 000000000..46dc0f467
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1536g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1536g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610600606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf0ff49dbd544f23b1b2d479f20c8d1aff195d8fd51e0579425af4a8b4db20717",
+                        "s" : "0x4b6c717533b2d21b4f93ea15035b95f15a41f1b34cd446e98626f0a52c62be77",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1537g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1537g0v0Filler.json
new file mode 100644
index 000000000..1c8e1117b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1537g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1537g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610601606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc6f98bacb8d5d4a1bcff91151f08411807435f8c6f4e2af3c7a7b71ebfd45a87",
+                        "s" : "0x14a42f8db8eb649a8850531de0f1f62323a2f0b8c7909ca47e6d9c7e55aadafb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1538g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1538g0v0Filler.json
new file mode 100644
index 000000000..9a6c7048b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1538g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1538g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610602606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcce6107d57898371a6439b37214bff503f4b2ef097891d44c6777e12e2b99467",
+                        "s" : "0x7911cfd3434fd4b6278158c25d10789825c232636a442e63fc6aeb9dbb0959b1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1539g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1539g0v0Filler.json
new file mode 100644
index 000000000..d4d405e68
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1539g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1539g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610603606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x019e9c55e4621d4517bdf0606c5fdb9fcfd073474844c13ff032add1e5c5cc17",
+                        "s" : "0x3edbcc4becd5eb0df74f9563ad09978f5124ec748b2b39353200aa07f6eb9634",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d153g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d153g0v0Filler.json
new file mode 100644
index 000000000..80e3761f8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d153g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d153g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60996064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x16aaab1a067891fccdc49f4472843293fb0953b0b8de3d97de9aff8ac2dc9e54",
+                        "s" : "0x1f7fcb6dad3e466ff06f7cb54b6ccd8333d37403e57dff240c94e6ea5464210f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1540g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1540g0v0Filler.json
new file mode 100644
index 000000000..1acc57eb6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1540g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1540g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610604606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x772dba192b74a468f93a84a6e6319e1cbfe5b7fd1d7d6769b458663c88ec5d6f",
+                        "s" : "0x5045b3ae6b91bd84d06e298fd51f93e49d7a91efbc1e36edff421db821b8584d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1541g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1541g0v0Filler.json
new file mode 100644
index 000000000..b22ffe05d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1541g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1541g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610605606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0c4425b851f9ad1e17248678c5fca0441d9ec617ec949d9382c971fb2c2ca5be",
+                        "s" : "0x7987091468abbc20fc5392f6e941ade3d0bbd808b78a31befe46efeffd01b942",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1542g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1542g0v0Filler.json
new file mode 100644
index 000000000..0ba16d45d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1542g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1542g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610606606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x49610e9800c7c3a0bc506e780ae71574ae90b2e0539a79be0a2d8cbbe488bde4",
+                        "s" : "0x0880d7942cf015b9c579e6767cde44a99e5564716e6e823b0efde67387d6a36d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1543g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1543g0v0Filler.json
new file mode 100644
index 000000000..4d66ee8aa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1543g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1543g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610607606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x915dbcd2e67debd5e0b9d233e10d3ce402ada6ddd8bc9b3373f531e3d180c54a",
+                        "s" : "0x2c29a0cd8201d5bed36eeaf687f65b6bb9ad8f586a113d48152f970ab8fb7d30",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1544g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1544g0v0Filler.json
new file mode 100644
index 000000000..8989989c4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1544g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1544g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610608606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7bc3e7769459369faf6a1b9e6209854bbd376a242c6ea9d70994f04faa56c37d",
+                        "s" : "0x0fef579efef5555ae6b0205a87d4b1dc9cc7be0ed007e2cfe439e9ea40cb247f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1545g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1545g0v0Filler.json
new file mode 100644
index 000000000..f072cda0d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1545g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1545g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610609606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc60d976b936fbabd3417844a2a416e873e39966ada145665dd70f3656335c837",
+                        "s" : "0x13fb2b88f52b0621b6da891a1e353469b50fd31da1f35e27dc76f05bcf546e73",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1546g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1546g0v0Filler.json
new file mode 100644
index 000000000..9c203ada9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1546g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1546g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61060a606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb892c9afa7643450b90bfa6ee42e225d34d139a4a92bdd81b5e3d9cfd51631ca",
+                        "s" : "0x0ab80587300ace6f826da5e5bf5b34bd9fc921ae51c86ecdbdb86d0ec20c903e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1547g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1547g0v0Filler.json
new file mode 100644
index 000000000..c02d60b46
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1547g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1547g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61060b606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2eb614ca7872c9e258ce3d258f64288dcddac2f87bda0ec28776484ccfcceec3",
+                        "s" : "0x6cba0b55fb664af41f2d2c8687e2e135e15b1d9222f6cdfc7080a85d006aac0d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1548g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1548g0v0Filler.json
new file mode 100644
index 000000000..ed3a29181
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1548g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1548g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61060c606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe7a57e5ead4712c62463e82ecd2beef2032af36a943e50ccfdc0ebfdfef810bb",
+                        "s" : "0x17dcea1118b7a35f52532ab9859e67ce7b789cf67d45e4dd7942b33f0c32a642",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1549g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1549g0v0Filler.json
new file mode 100644
index 000000000..b1bd97212
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1549g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1549g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61060d606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x93b117528833aac93b589bba5b741248f83c9c33b9e27bc941b34b4f058e6b02",
+                        "s" : "0x67787ded5f2f17cc2cf8effa07c9f9a053db4b3830f7be085117eb9395383fa0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d154g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d154g0v0Filler.json
new file mode 100644
index 000000000..d37db73b0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d154g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d154g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x609a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7ca023b732664985fcf18b3c4b8dbc645cdf36d720901371e0a7a757a78e1c82",
+                        "s" : "0x7bc4d74f505ce22442c6bc4fdac1975dbc4c204d99f27db8399846843e7f99cd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1550g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1550g0v0Filler.json
new file mode 100644
index 000000000..39035873a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1550g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1550g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61060e606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xba095581d7252a74062d673ba1a02b845f2e5c9a33592dd59cdce50feb699c60",
+                        "s" : "0x1bd977542d9f938cd99f41d5623ee5b07378c9880c915ba19a3bcc4b2b3a8e64",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1551g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1551g0v0Filler.json
new file mode 100644
index 000000000..d3093e367
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1551g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1551g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61060f606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xedc421e7ca0750252a693a255941e5fb2ec11fef003f8c6fda2c8dede036ebc4",
+                        "s" : "0x56e4318d44bec5f1f7ad59481517da606b5f01d6fe3876b0175fea2393610d79",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1552g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1552g0v0Filler.json
new file mode 100644
index 000000000..0e7ea21f9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1552g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1552g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610610606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc1473e5c0f0d6b2dae89fab8860440d8813d2b646b7c5243d6095850b2877b97",
+                        "s" : "0x03ea05910d2de80dc50689159701ca745d5edbc6d8a1007ee5cb1c9dd4c644c8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1553g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1553g0v0Filler.json
new file mode 100644
index 000000000..efa9f2448
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1553g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1553g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610611606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x10b33c090ca5245123ca113ec43d4d5cd6d3c1f55bd93a81ed369a74169660a3",
+                        "s" : "0x548b352cd5a780e211b3b081cc70a5cd2ed9e295457076e7fcde95fcdcd76665",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1554g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1554g0v0Filler.json
new file mode 100644
index 000000000..060b24fdc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1554g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1554g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610612606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd77dba6f5d3dbb3b591eee66c2e78b2e2e8d267464c2cf15278f04c97a2e0927",
+                        "s" : "0x46202b937eb6b6c87b3a75d2772a70c15a239bbe6407c3c808a8c039e4279fb6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1555g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1555g0v0Filler.json
new file mode 100644
index 000000000..e501fc21b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1555g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1555g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610613606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd4e2ff2fdb5ebeb1ac15cb18ab1926f2fc99fe4f6c4157fbabcb84e40a1abcc5",
+                        "s" : "0x0ade5e84c9c00d5bf8d2bf2dae3428394adee8165fbfd0c7e0c3129f069212d3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1556g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1556g0v0Filler.json
new file mode 100644
index 000000000..9277a1aa2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1556g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1556g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610614606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf01f482d6575cf4f630c35b43692b45fbaf8189a9ef15cf5ef592a0bbf6b4578",
+                        "s" : "0x410b31b73ed3efa925bbde3f2e72969e32779728577b3a8b8527f119d5eafc1a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1557g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1557g0v0Filler.json
new file mode 100644
index 000000000..d5acf83b7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1557g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1557g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610615606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5a3c059fd2b6179d93d0447efcf578d3959662a1169d90c7ee1eece77ddc330b",
+                        "s" : "0x7b15595c849901d0a5aa80d9e433b147e01697a81921a4329b8a68af67200e1d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1558g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1558g0v0Filler.json
new file mode 100644
index 000000000..1fa9a2582
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1558g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1558g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610616606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc9b9d2fd810d6c1936f433a798d20b18dda92afb214f269a6841c9f57227e45b",
+                        "s" : "0x53915084d7a0df4e3f07ce6e11d5a1f23ee78914e546c5f8512e49b007489bf0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1559g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1559g0v0Filler.json
new file mode 100644
index 000000000..9068479ad
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1559g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1559g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610617606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x79c5e71221b6fa456df905dfec1314baeb202f8022292481c59ae18fa10b614b",
+                        "s" : "0x7fbce4186526534a87356a4b4007a31b8241de51a96f8f252684f5756f5ec6b0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d155g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d155g0v0Filler.json
new file mode 100644
index 000000000..7234caf49
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d155g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d155g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x609b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfaac68355b1230cd7a7fc32dd6df434dba18bae201bd713e593b903d4fec51c6",
+                        "s" : "0x2b98c99ee40c13456cc14dd9717ae2a1d447756a434da608b450792372338c58",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1560g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1560g0v0Filler.json
new file mode 100644
index 000000000..cfadeb7f6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1560g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1560g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610618606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb58fc150a6e32e5f677a732700c0d832f65e9e94e4c57bd595f669e0d69a68fe",
+                        "s" : "0x04b8e052b493aa1e1cba738525861e8b897ed7fb35fa652d6752a23600f6399a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1561g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1561g0v0Filler.json
new file mode 100644
index 000000000..895ca99bb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1561g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1561g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610619606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x554cb38195401ac7c7690895336443c69939024f6c61c75563bef740fcf42733",
+                        "s" : "0x327e4df8cfb6c31dda83f59e33a2786dc71b1f4fa5ec90f27840cda67affcd9f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1562g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1562g0v0Filler.json
new file mode 100644
index 000000000..8c116aacc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1562g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1562g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61061a606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x281463b4eb6df11b6b011121c672280322d8d5d661301e40f9b114dc2a860fef",
+                        "s" : "0x6e1812bcec503fc40ccf8ba247d57a864b9a29b0a57496200d41c47b801d4639",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1563g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1563g0v0Filler.json
new file mode 100644
index 000000000..1d0d22b10
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1563g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1563g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61061b606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9471ef3d8d6f9c49733787dc46f5664594f68d96df838da16510c3168847d9e7",
+                        "s" : "0x5f2f53ccc9fc2266c5c51b14a53c25eb7c5ff52f8b99629868aa1a5f65af3cb6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1564g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1564g0v0Filler.json
new file mode 100644
index 000000000..3751b1d98
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1564g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1564g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61061c606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9dd8d21c03f5b0fba876c8b800a936337ef1257c44ec628f4befc68020fe1e2b",
+                        "s" : "0x6d4ea4e6787edb8c79b536e1e55d216b3091fe41c59af06287b6c607d5deb3d9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1565g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1565g0v0Filler.json
new file mode 100644
index 000000000..a979ef3de
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1565g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1565g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61061d606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2d99f9b6ae6bc91e822bd652186637e2dce41f03f330406c3733b9f11dafa480",
+                        "s" : "0x5b8db91ee1a0a731206f55a20532663ceb4706d2579054702349c06f927530e7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1566g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1566g0v0Filler.json
new file mode 100644
index 000000000..7a097237f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1566g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1566g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61061e606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7e611099a8688541bcbcda2d7f7ca14299540cf7c993d246523d53176a738ea9",
+                        "s" : "0x65523765f2bc1a6610629a1b36b566d6e3dc0a915a0c87dea476c6f6872c9de7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1567g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1567g0v0Filler.json
new file mode 100644
index 000000000..c95d23577
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1567g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1567g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61061f606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x295d94558ad4056b5fd4aa03b0f62ce87d0aabeb9ca962906a886416d3728e0e",
+                        "s" : "0x2b7f113e54d8953e5b8ae055975f2b5a0e47e2ecd3c711b3f296e24b6283ae40",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1568g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1568g0v0Filler.json
new file mode 100644
index 000000000..c1e00f7b6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1568g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1568g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610620606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2e2091b6a4644a4017e423a6b3f7c5b0bb3cf35ed5485ca9f3d126d06e2c51af",
+                        "s" : "0x4f7b8e259f427d97727b41789735bb610ed6297c5deb4dc55e8e09661f37c99d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1569g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1569g0v0Filler.json
new file mode 100644
index 000000000..ca8fc9327
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1569g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1569g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610621606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x90b53489a18b6887ada81fbab398c9a24c60bd2226cff88d2f1b96bef5490ec5",
+                        "s" : "0x7593a2a91f58b1c3bac67707b397cccea8af34536aeb0edccf29c69adc3acbf6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d156g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d156g0v0Filler.json
new file mode 100644
index 000000000..6bb3c3737
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d156g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d156g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x609c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaac7953511e207b993ef69b9b8ae7eee1dbe43c43ced4b462e6b19114ba1caec",
+                        "s" : "0x639220d92fa85a6604959ccccd167458cb3967cc7e2e2bccf3ab64bee551d3ad",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1570g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1570g0v0Filler.json
new file mode 100644
index 000000000..52fd9cc36
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1570g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1570g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610622606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa1ba6effc9fff7466598fc58396f5f24eb77b3e269dd4e8aabde49f51d3f3f47",
+                        "s" : "0x236cffb4b1d4dd3f77bc3ec02cd19bf19ebccce59b908dcc71800446d4fb3b3a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1571g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1571g0v0Filler.json
new file mode 100644
index 000000000..4a998066d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1571g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1571g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610623606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x25c3c673d81f177461690edadc9d5e68b01619914e02da4004c58e336724f178",
+                        "s" : "0x3842c628df9da6228cc926da9b9c313a704bfa27d2ce1ae8f6a970cd7d7f56a4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1572g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1572g0v0Filler.json
new file mode 100644
index 000000000..94d32938a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1572g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1572g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610624606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x58a96137a016d7b7c6acaff8c5ff680fa8f42a6e0e40bcee00b868ec41be1ad5",
+                        "s" : "0x3cca131533a2f8efbaefebc5099ea3ac1244497e497496a6c64be8e310950e0d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1573g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1573g0v0Filler.json
new file mode 100644
index 000000000..c40946153
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1573g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1573g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610625606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x559626e2b7a63a8b0a1d22765426f9599dbb9ef541b07779944bfc157ccf2e74",
+                        "s" : "0x6872d5e6e0b4e97d5777c3edef6461b20a104bb84ec62e58c70576fd2ada016b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1574g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1574g0v0Filler.json
new file mode 100644
index 000000000..c8d17323c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1574g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1574g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610626606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x256a696a3b6d1c31a15f2bb299216df0835ee0ae51d33991c3da966ece56f762",
+                        "s" : "0x78e3495993ce1423b6c743b80099cb7e972fe85d6e01b31adba51e0ff753b3d3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1575g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1575g0v0Filler.json
new file mode 100644
index 000000000..9f61d0768
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1575g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1575g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610627606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x937e9399391f8e383e9db39edda2fd3d716c88c107edad54984c058403c5e58a",
+                        "s" : "0x6985d77e58fdf1e7dd39621a6955aba4afc2da013aafc14c71536735c33bde1c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1576g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1576g0v0Filler.json
new file mode 100644
index 000000000..8d4611042
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1576g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1576g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610628606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdd5738402f00ad353f4e748ea9427011aacbd019e6b4b3ee67d21952f5f23ede",
+                        "s" : "0x0d99e3ff8fae34c394e360b5c3cec75592a7c7064fef8e49459f8875edf289ef",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1577g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1577g0v0Filler.json
new file mode 100644
index 000000000..11b0cc015
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1577g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1577g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610629606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x63aab84175cb5aa6a34e1dc85e7dbdb342363849c77a97377480b74599966f67",
+                        "s" : "0x503a3513f238c429ea44fbe9e6eaac8f39929b3c49ac10ecace4592f5eeff07e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1578g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1578g0v0Filler.json
new file mode 100644
index 000000000..0e09283c4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1578g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1578g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61062a606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6c3a670b3f5f28c451d0ea1187d108dc9752a1da5a4c33f09cb3a0543d8d594f",
+                        "s" : "0x511c3fbb68e676beebac109275263e4911c220dc048ee0c8ec3c46f9194b66a8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1579g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1579g0v0Filler.json
new file mode 100644
index 000000000..0cb1fd16d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1579g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1579g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61062b606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdabfb95a04dc93edb077a2775fbf4e5d1aaceaea7095cec92030571619c8b103",
+                        "s" : "0x0543cc91653946d3c2b5f967c4afe8a27f3bff99720526eee796b3b028b26814",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d157g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d157g0v0Filler.json
new file mode 100644
index 000000000..03874ea86
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d157g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d157g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x609d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0c0caaa53ff4031f5fc1d4e47e5de896f2c6ee720268c2a145deab6b361c9a8a",
+                        "s" : "0x7a3c64a9acbb40463651c8d54646e6c576222ebc13fd9b20ae41dc4100f65df3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1580g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1580g0v0Filler.json
new file mode 100644
index 000000000..d36854965
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1580g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1580g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61062c606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x81f445de8a0130ae67c70978b852e5f25cf133367b38bc489b5a511e1d5ac0f9",
+                        "s" : "0x0a6e317352f74d55b73e906ce29543a2848c92c94fa81d9b89f4cafa98ef561a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1581g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1581g0v0Filler.json
new file mode 100644
index 000000000..5c44fbead
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1581g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1581g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61062d606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa0fdb86017542a1536a8ea528261d3368fe9242f96bc26efd5637aad361f0d2a",
+                        "s" : "0x5822d232915173c73e1a6ad15764a35f3ee0583242a20314003922f44a8661b1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1582g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1582g0v0Filler.json
new file mode 100644
index 000000000..f1faa1b34
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1582g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1582g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61062e606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x57b9cf3c5f71f7dfc47e736ecfb0c95cf4e0440e9861836f5c09c28397968b47",
+                        "s" : "0x41751b0e14294e4b593f6b91e62fa41a10feb7e94edb54726f30b1320d6864ae",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1583g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1583g0v0Filler.json
new file mode 100644
index 000000000..f3c2a9d4a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1583g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1583g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61062f606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe5c06c786b522e2ac822c3a9e2c77237f8e09120b8709bc48472d7612fb26026",
+                        "s" : "0x14572461db3e222d62fb3d32e921f8118c4bbf471726ef48ed634ab5c91a4bdf",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1584g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1584g0v0Filler.json
new file mode 100644
index 000000000..6dab265fd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1584g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1584g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610630606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1fc74983096545a3095085439746ba1503062155ca7bf41d86355f458db549ff",
+                        "s" : "0x301da71ff4208104ad96494f75c1d34c2c2194eee010f6f5355f6ce6a4950e47",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1585g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1585g0v0Filler.json
new file mode 100644
index 000000000..3c4c92acd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1585g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1585g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610631606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x128fb844d4fccce5e8a75bd31962fee971143c6347542bd65729fc93fdb6cbbb",
+                        "s" : "0x459da3e9eceb4b1d02590489d0a9e8d7709e79ae8d4e1939366bc17501e345c6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1586g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1586g0v0Filler.json
new file mode 100644
index 000000000..2c12def2a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1586g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1586g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610632606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb050b4e4a5d4204fa90767a742aaa952bb53429194261d31ec54815f1c00b569",
+                        "s" : "0x3f4ff68acc8b344ffc42166debad0d214047f943c42b61785ad50e94cf650065",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1587g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1587g0v0Filler.json
new file mode 100644
index 000000000..3e2a44e0c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1587g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1587g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610633606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe05a4e0f92ff6f234e36f4045b27f920847f3bdef00d5198b3a3d05dda8b2e89",
+                        "s" : "0x1465459d3ebee809a4b740bd7067271fb72d0c13d31834bb0721ee9b761954e3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1588g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1588g0v0Filler.json
new file mode 100644
index 000000000..7146fbd94
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1588g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1588g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610634606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x07ed4ce1056879b4ed0abde175537dbbaac08cbb770ba56eb1c49e92e0a01409",
+                        "s" : "0x7b2872f8875af61beb255d848d7904e0c8c5df75d8765c308971bceb24ac3e1a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1589g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1589g0v0Filler.json
new file mode 100644
index 000000000..1e37ab728
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1589g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1589g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610635606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xba9a3a24f7f2ac0cc2b6f7606d782ebc9b73f3d90fa72e6a8b2197cd414f5260",
+                        "s" : "0x3d07afd083751759a4e152fa3693e1d63ba2871da87c4a38bdd16fa32d3c12e3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d158g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d158g0v0Filler.json
new file mode 100644
index 000000000..45818f060
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d158g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d158g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x609e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6a75b428939e7859b31355ad97faf216f2b7bdef6779217228652a3ca97cb33d",
+                        "s" : "0x457c0d81ecdc474210c07e5a0b20e29d6b865670fb69a31e08d94cdb6d2c0515",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1590g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1590g0v0Filler.json
new file mode 100644
index 000000000..6af603362
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1590g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1590g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610636606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe9ee16c6eb635a3bb6cf7853f58d2d348189ad1dd0c9538233d99d97f4b54e49",
+                        "s" : "0x79ac3abe42e27b73cf379d1452fe07506e60a81f99000c93f0e0dd6579e7c652",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1591g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1591g0v0Filler.json
new file mode 100644
index 000000000..5a094f2fd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1591g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1591g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610637606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd45fdd3a8b711fe3179e31b63a0b9fef03e9e013ed4330eea7a76ab3340bd3bd",
+                        "s" : "0x6dca621ec62676f9d478effb806e4d35e5f0590193135f152fd47f6ff730dc07",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1592g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1592g0v0Filler.json
new file mode 100644
index 000000000..4eab591a9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1592g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1592g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610638606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x63eb8975722f426ac9063d6e94da4cf81eb4700c7ef1d327cbccc3dbf2de81d8",
+                        "s" : "0x0749c6f0394cc6a3172559507af75db9cbcc4b9f0b131584e74b925056f046f3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1593g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1593g0v0Filler.json
new file mode 100644
index 000000000..2f58d6766
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1593g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1593g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610639606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc9731bf9eca6df89154f7a94d415f20ffeea10812ed4cb9adcc183d13b46a0cc",
+                        "s" : "0x2593c42f3064b0da052162d44becd89d7011f93f20b8ed08641100a83806c16a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1594g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1594g0v0Filler.json
new file mode 100644
index 000000000..f4f1db132
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1594g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1594g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61063a606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2da96bd16fdd1782bafc54523c983767712ce3c8174287dd9b08fb9ab9584835",
+                        "s" : "0x4258579e732f4c1c9a2acac32cedf83a2a01875e52d801603d01e3c8d45e56ec",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1595g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1595g0v0Filler.json
new file mode 100644
index 000000000..a3491385d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1595g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1595g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61063b606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2d39d460f29c2856bd3384dcb1469a5432d92fae0e680d3d4aa01bcc0bf8e10c",
+                        "s" : "0x669599a37e4af2db4ddab4c1d2026ea0d82e68e76f93c37ab178e5cd63d10fd0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1596g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1596g0v0Filler.json
new file mode 100644
index 000000000..21d4dc564
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1596g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1596g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61063c606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5afd4d81086406bd14a82828f9a309d4ed197f2debffe7b3e5befa1638006af3",
+                        "s" : "0x7fe5e2fda09943a3510a2acbbb663f8b75ece42d74d70bc5ae1a385f34f81c7f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1597g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1597g0v0Filler.json
new file mode 100644
index 000000000..80334db07
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1597g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1597g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61063d606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x30f1ae4b2abd825a560d27102bc7d7698803bc3f900f8e5e4ca9a0202b094589",
+                        "s" : "0x60df1dee654c70002a4c9d0259ccc306a742ab6a29ed1f08251e081bc0401cd3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1598g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1598g0v0Filler.json
new file mode 100644
index 000000000..fab38e2f7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1598g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1598g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61063e606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4282d1d4a7bed278b73bb7e47290db526617652c63910c81913c242303200213",
+                        "s" : "0x4862dfbc6fe5674d0f6ec8583960afd9ea65b3dba2e4e0b1d0805199682e0fac",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1599g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1599g0v0Filler.json
new file mode 100644
index 000000000..f7ae802e0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1599g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1599g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61063f606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd2f79044deb2e625c22bea0b5480d3e681aa0d261981e01bd1878b32f3381567",
+                        "s" : "0x6bab084b6837b2885ab1be5efb86c2510dae097d2d207e3afd9b0f393a3ff17a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d159g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d159g0v0Filler.json
new file mode 100644
index 000000000..9dc22f947
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d159g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d159g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x609f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7a0fb6e9f6a0461f7cb1c75bcfc537e3c736e22ff859d1b3ac41fbed1644fbd9",
+                        "s" : "0x56eb4e32429c14c64841334252aa21ccf7da0f83f5225c7eb91b7b1ab7e4170a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d15g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d15g0v0Filler.json
new file mode 100644
index 000000000..e490f2dfa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d15g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d15g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x600f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xea940c70ef82c05a559d312f14a551755df9f9cd6ed6443870285f320a05236b",
+                        "s" : "0x32d1880ecceed317f1f7c43b6b8ed9a5f6d27bcd7bf42bef76aab3ed3cb9764e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1600g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1600g0v0Filler.json
new file mode 100644
index 000000000..21a51e4d7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1600g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1600g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610640606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x389605a8e7e36faa0106a601e32a24043e5c1a71e342181223bde2edc9ced98d",
+                        "s" : "0x3fea950506936cdac49b79ac6c33b14b462846beb5f80d5454a8aee625120a61",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1601g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1601g0v0Filler.json
new file mode 100644
index 000000000..4bbe33220
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1601g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1601g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610641606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2e221c06ae7b4df5d1c9df1fe10dff330f816e543e665427d04a91f070b560ba",
+                        "s" : "0x3a18a38e9d1bd242684edcd2825066ff4e0db41077a9715808cedc2286501601",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1602g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1602g0v0Filler.json
new file mode 100644
index 000000000..cec51f67f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1602g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1602g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610642606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcf7f25b40baec0002a2c53f36f9f48e75eab351edc94662f3a86be3609a37e5e",
+                        "s" : "0x5b3fe80e821caf4f28f320a314a2b11edd044afe42ca6f4d0737686b7b1386b4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1603g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1603g0v0Filler.json
new file mode 100644
index 000000000..22814501a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1603g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1603g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610643606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x10bd6acdc84b452ec2b7ced71ab420667313b74f591269b8a97d8624e9f77b69",
+                        "s" : "0x62b8db5b989f14bf4892c63a893e518133c2050993b3f7be6841b16497b751e1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1604g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1604g0v0Filler.json
new file mode 100644
index 000000000..f96c849d6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1604g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1604g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610644606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x076079fbe4ea6158c6d14c7e4c0aa85cfc156f0a537f721af52d6ed13b670bfd",
+                        "s" : "0x6de4ddfb55e9b123a5c553f8c16620ff8e12d1c7c8f320d10a670b12bddd01d9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1605g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1605g0v0Filler.json
new file mode 100644
index 000000000..17f5381e2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1605g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1605g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610645606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0fabbb73d5a0dc0bcf2829c51733f19b920bdb326def96a011e109b2532942cd",
+                        "s" : "0x54abdaf8a3fbe86378843a7ea8d65f412648b11ce0f817b43c4efc5d9fe8ab5a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1606g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1606g0v0Filler.json
new file mode 100644
index 000000000..782b7e58b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1606g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1606g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610646606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x88143c615c594a6facb180a5263e397143fe7c968745eb2bff21fbf902fb551f",
+                        "s" : "0x5f5279e63cbe93dba750cf1629b4b6da477cd89eccbba401eb0a6dbba3d82a8f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1607g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1607g0v0Filler.json
new file mode 100644
index 000000000..a2d85302c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1607g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1607g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610647606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1057183684cca82d934ed9ea8939274ed512c9c7167dc2d5e387625360a841e1",
+                        "s" : "0x596c8e50ed5435933da82640391689ab2843ae9ae910ee824981801f951091",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1608g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1608g0v0Filler.json
new file mode 100644
index 000000000..33055c0aa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1608g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1608g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610648606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcb3a648366078d6c0b62e2d349d2aa42fa84cbe858a67b6f3420e9747836994c",
+                        "s" : "0x060f10d2b9e63c32391b5bc281ac4df5cf91c495a23d64b85d268aac57b750cb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1609g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1609g0v0Filler.json
new file mode 100644
index 000000000..bc1fb92dd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1609g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1609g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610649606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc745d9789c78ccf06fcb38898f202c7bc72caeec13c3e73ea274d4678bc351bb",
+                        "s" : "0x22a60b724bf0ab91d0936936ad4bb12cd828fc20371ab867d9b45044e72c67b5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d160g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d160g0v0Filler.json
new file mode 100644
index 000000000..b9981ad2d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d160g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d160g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60a06064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4c9127fa498bc5d646aa1bf7d20b8d8b2934ddadd11cdc43312ef78dc0fa95a8",
+                        "s" : "0x3ed387efd6059970bbd0120dfbda51dd387b8da16bd483b9f1403626d27c0e6b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1610g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1610g0v0Filler.json
new file mode 100644
index 000000000..88a2ee505
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1610g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1610g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61064a606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb06edf3b829e2fbc73d54643dfa215a3d219a739540e7531f64dc82d36e8e926",
+                        "s" : "0x35c86f8e870f8d8106cde8f77b727c21bf6bad5a3d0ba081afd8bdb99fb549ec",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1611g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1611g0v0Filler.json
new file mode 100644
index 000000000..5aeaa15b9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1611g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1611g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61064b606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5ba483df4d4ef0fa62fc3ee51421e79fd22a1d17ac08abf70074b44e152ab2a5",
+                        "s" : "0x3553838091ce804657ec5bcde7df3c233376e3fe6514a87e8f7bcf61de1abef8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1612g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1612g0v0Filler.json
new file mode 100644
index 000000000..503670708
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1612g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1612g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61064c606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfc78a69798e91cff51cf2634f40509892bf17d2448bcc13d04ba82110c7fc3c8",
+                        "s" : "0x114f14129ae7aa8e3633756cf4da59346e0eab1d61ac28c96cef8b179a625015",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1613g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1613g0v0Filler.json
new file mode 100644
index 000000000..d549aba8f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1613g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1613g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61064d606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7bab1c44fd58ce8dce29f33290100946ff75fc96bdd6d7d125d9f0612472cec3",
+                        "s" : "0x5b88479bbc48c856f3eade7e0a81f2e2fc47d3b0ebce186365c5199aeb1336f7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1614g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1614g0v0Filler.json
new file mode 100644
index 000000000..da27f60d7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1614g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1614g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61064e606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x06c7dba6105c205c47aaaedcd90b93c39feaab7024393cca615b47a8b89b6c02",
+                        "s" : "0x245711b1841b74cd657b17398ca74e3f38542e0a2cdcf7ffbbf3bc830469e556",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1615g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1615g0v0Filler.json
new file mode 100644
index 000000000..ce4cc72c0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1615g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1615g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61064f606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa382c05f2ecfdeb315ccdc52263b3a1aa7596986eb7eba0ec77fefe0db02a499",
+                        "s" : "0x2fb5fb751c86e2ae2edc27916e19156e57218e2a92a26c0becc6053248c39a85",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1616g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1616g0v0Filler.json
new file mode 100644
index 000000000..ba92c7181
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1616g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1616g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610650606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x55f474f5b5d6f425cc4f9493939938c0b68a2fa8225eb0124645b3c6ba8257e2",
+                        "s" : "0x58b7b5948831c206064ee6e28cfe83c13b26cb7a89f7d91dc3deb5e98eb12bce",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1617g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1617g0v0Filler.json
new file mode 100644
index 000000000..78e351765
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1617g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1617g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610651606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x14f4942ce35c66d3ed90fe27c2eb8e244dd9349511713aee174b16a33522a6ce",
+                        "s" : "0x5b3f475a8525a89813e9318e584362e6fd816289927d6fdbefc21b5bd7782035",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1618g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1618g0v0Filler.json
new file mode 100644
index 000000000..3de947fbe
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1618g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1618g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610652606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6ec57222c8e0e3baa8f3e8728db7d4a6c78184cc35051e4fd60e55cb6eee1799",
+                        "s" : "0x7c5b458257da865c6dea5fff9710afc282e7b2591cab9773c4acdc4bb6288f07",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1619g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1619g0v0Filler.json
new file mode 100644
index 000000000..f64f71a7b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1619g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1619g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610653606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8b2c2e69d3b81890be12ae362b209f7490e4fd7c4f5c514b53c6b4f0e9555a04",
+                        "s" : "0x4a494cdde8dfe06149bfc668698b7bfc7cb800331e457fd5fe4587df0f552361",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d161g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d161g0v0Filler.json
new file mode 100644
index 000000000..cbae40e12
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d161g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d161g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60a16064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x994b930a9fee4b59b8c92da5f0c0c1c28093519aab5bbeeb828d61c789105e9a",
+                        "s" : "0x191e2babb00d75715a7fccd4a2040d8d34a958d666994b95c46a6865d16a095b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1620g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1620g0v0Filler.json
new file mode 100644
index 000000000..12a40645e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1620g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1620g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610654606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x06ac3cfffcd921f781aebdec652b6250aa75e17723658476415573978b1ecdd1",
+                        "s" : "0x3105712ddbb465ad1eb9838ca847a6c95fb5801bfb38fbb206a918c8fa296e6d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1621g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1621g0v0Filler.json
new file mode 100644
index 000000000..8b6cbcba0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1621g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1621g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610655606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0972cfb80c4899da1b1409be401f73ef7acdf1d5edfa5990fd276aaa5f3a6b36",
+                        "s" : "0x49baa96c20525fd3537cd90560cb13ce711b5cf5fad24bc5fa56c1201799b6cd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1622g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1622g0v0Filler.json
new file mode 100644
index 000000000..2b7817aaf
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1622g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1622g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610656606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfb2a72796ab924c2e1a9e9bab44262b4a81529fb5e2e56b0721da8fd8f58670d",
+                        "s" : "0xf6201507b22ada3cfc9d6fa2b3c00bea693988ff7482042814744414ee4d62",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1623g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1623g0v0Filler.json
new file mode 100644
index 000000000..ab4b08f43
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1623g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1623g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610657606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5384b86ea3b8f9085d68406d42b4afc013436e15fcb19bcc8e652d1a0a5b30cf",
+                        "s" : "0x643f2d477958fa9f7a4290b7e471a7f808423221b1223dc31305f23e5429efa2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1624g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1624g0v0Filler.json
new file mode 100644
index 000000000..b3adac46d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1624g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1624g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610658606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x68b2e99c46d64b5190e316ef6823e321717fb36638d23f8d4cb575e70226f82e",
+                        "s" : "0x173bce2891884ef899f2492f19acc8f76f94839b14eb9e3bf25734f61e0e7952",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1625g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1625g0v0Filler.json
new file mode 100644
index 000000000..36ee39bf8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1625g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1625g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610659606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8217a322f86e0d5f316a1af200f651adb4a266c6e4ed19ae80368ea9515ae6db",
+                        "s" : "0x0c68789d05b9e20e2292d07e723ae7077a95e8971126a72161238074c19a84e8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1626g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1626g0v0Filler.json
new file mode 100644
index 000000000..9925f322b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1626g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1626g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61065a606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x08e335dc4e3282feea315f1d505c0c3d34d4dad6b3a94a0bf628f90b0899b76e",
+                        "s" : "0x3c0de627297c7171e035edd63ff8187f96a930160dd9e314872f15a1fe529d94",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1627g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1627g0v0Filler.json
new file mode 100644
index 000000000..2c8753ad1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1627g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1627g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61065b606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x56566d9e7aed9c84acb719e3c0d230e4db120c051a283e834974bb89808a3a7c",
+                        "s" : "0x67e31d8d29ed5509e4383f85708c704e9ba14ba9f63e7767b4a830e97fd058af",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1628g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1628g0v0Filler.json
new file mode 100644
index 000000000..7301eec9e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1628g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1628g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61065c606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd1cfed599d9eb942520d5742f07fc0314c3e5db243d6967f4fddccac8d12d46a",
+                        "s" : "0x75d5a8dc690e9632378fff345ef477bbee753dbffb8d2fddb12e964479c66705",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1629g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1629g0v0Filler.json
new file mode 100644
index 000000000..eb646d4c0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1629g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1629g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61065d606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb904b73c6404f03f5d286a9b7f6659e7ba17c9f51268c6e32a5c182a1c41d364",
+                        "s" : "0x7f06b7c77f183613cf3d3142caaae23ee86b834089badacf1fad71e0fc88b838",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d162g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d162g0v0Filler.json
new file mode 100644
index 000000000..a11d6d69a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d162g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d162g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60a26064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe4423650d2bb29b7249345c8dcd9f8cb6a4c57caedcd35540207831dda1cb2a5",
+                        "s" : "0x249db1d71adcdd25f3970640ebee5312e0c96feb5c4a3c677ce4b062351b8a12",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1630g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1630g0v0Filler.json
new file mode 100644
index 000000000..3ee781136
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1630g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1630g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61065e606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x67c6ae323135d4f3ad66ee376461c300f86c4e4118947654a02e5910cde9501b",
+                        "s" : "0x11a4f2a20f0bd019444f51c4c3fa55a7e15c3f47066148239a278c402cbaa852",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1631g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1631g0v0Filler.json
new file mode 100644
index 000000000..932714a16
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1631g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1631g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61065f606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6fd547bd92e8fbc92316e55fbfa9e48b195faa925473eb1ae8bc6554ed1d4f78",
+                        "s" : "0x2c4533a90af783427d33144bd146cf36bf62f9b10b28273e9a2c44864b7aa535",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1632g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1632g0v0Filler.json
new file mode 100644
index 000000000..749e12228
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1632g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1632g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610660606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xec42d6e659d9618ca7904c0939f3001034b315b7543ee6e990d4124df1fed315",
+                        "s" : "0x2a6d61497f2cdf46c747d86f7da237c108964a6507a1d69d4bea4cd37a366aae",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1633g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1633g0v0Filler.json
new file mode 100644
index 000000000..c2c63139a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1633g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1633g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610661606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5f8698fcea287b74740594d0dfee15d5d493ba085168023b1595cac3e931c12c",
+                        "s" : "0x58d4655f652d5c8326f47df6177f76cc452aa1af93f7f261976261ba8b906519",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1634g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1634g0v0Filler.json
new file mode 100644
index 000000000..da069aa35
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1634g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1634g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610662606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xed57c30bd49e6facd0c3fe19044228ec7fd381b096ee2e9c1d32275add788900",
+                        "s" : "0x51c89cd97d24acc8ff15a58456537f7f96e03d236d480e27a688dd39683b7062",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1635g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1635g0v0Filler.json
new file mode 100644
index 000000000..67731ad17
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1635g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1635g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610663606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8887d2d1dfde752184af99fafbaa7385991084dedbc8cd2c74e4e909fdea827c",
+                        "s" : "0x5c896510474b12c433ea90bb8eacb9cc1de0dac268a203438ae28fd126d5921d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1636g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1636g0v0Filler.json
new file mode 100644
index 000000000..9c494fdf7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1636g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1636g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610664606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa7cb7102e1fec4e28f0532cb8821111fc42e6211b686b346f06eff2ed637bf1f",
+                        "s" : "0x6f985e531fccf7b58c41fabe8b87a9965eb0bba4568319f2d6d3b92e8cdad7f9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1637g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1637g0v0Filler.json
new file mode 100644
index 000000000..e49fad2fe
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1637g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1637g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610665606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9cb34bcaa2a772a8c067f6eb5d92a50f66040ab95df768229b7015bf7e7ac8b3",
+                        "s" : "0x4816d88f6f3ecac4aa8466165fe361331a1b85a77366603a0d59622a3a66cbcf",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1638g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1638g0v0Filler.json
new file mode 100644
index 000000000..6dae7afe9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1638g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1638g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610666606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc1e4a7e687e24907a77ff20a09a67ab6dd3fc1c6ecddcfd41f60fc2631e3d594",
+                        "s" : "0x79d0188afe72371059b6b49957bd6a442f8fede102a2c77107902d28b5dcaf0a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1639g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1639g0v0Filler.json
new file mode 100644
index 000000000..1d2887b87
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1639g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1639g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610667606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xabd4c542ed31004b6d2391cde3c9b1c35197a403a0bae0a3f18258c7efce8eb0",
+                        "s" : "0x5cb31ca806a0e04f39ba644fb064b51f95e8949b3f9d51634ac1d79f4fa45da2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d163g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d163g0v0Filler.json
new file mode 100644
index 000000000..9e692c0b3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d163g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d163g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60a36064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0198aa8ea1ce6e2f2f303a5424263808613034b9e100d49aa5f3c2cbfc71fce3",
+                        "s" : "0x0a31aeaa8ac10f0d6e9d0d2a4c51d12995c3c5cfa0e606fac4e0093f7a1d251a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1640g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1640g0v0Filler.json
new file mode 100644
index 000000000..df132dddc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1640g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1640g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610668606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x153ddb3c7d5614bb36d260c2bd8f3b6ead641d3792cfab11b148df7023c0907d",
+                        "s" : "0x5d2e600b89143380534de27985fcaacb5a77653d4603dc9250aedf48c3659ce5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1641g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1641g0v0Filler.json
new file mode 100644
index 000000000..a54257e6c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1641g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1641g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610669606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb81f001aeeef4fb2d5c539ad1eabfa0dee0c4eebf8e18da472f8e6aa7a497c2c",
+                        "s" : "0x078094e32164e05dab860ba0ea41bdde8a82300a9d94d4ff5cce26817083cb61",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1642g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1642g0v0Filler.json
new file mode 100644
index 000000000..302ffa9fa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1642g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1642g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61066a606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x78ca453ea7646b69f24dedc8f579760fd0d6de778753e01742a69a5755059cd2",
+                        "s" : "0x15d3b7d8128d1da1db478370521e0c101acd80b271f367f706e773c208c02bf9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1643g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1643g0v0Filler.json
new file mode 100644
index 000000000..fd119ef71
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1643g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1643g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61066b606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc04661a6c29880e87ee8635808b9fe00e4e5bb81cb0f29efc7af27cac376880c",
+                        "s" : "0x435712498be06c2929b096fdeacdcd8401c94c167e5c6b25d20add44c683bac3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1644g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1644g0v0Filler.json
new file mode 100644
index 000000000..bff28f017
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1644g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1644g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61066c606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x97d5852cdc29a5fdd4aa98cabb830302a5f03707916f884c6511e868a0698741",
+                        "s" : "0x4fd900777bbe5aba4bbc0577abe43b10148cfb4b3bc72c8cf62f3a655b9ee630",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1645g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1645g0v0Filler.json
new file mode 100644
index 000000000..ef284ab8f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1645g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1645g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61066d606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x02d6c0576bc97b23f816609ae5e3e2e6cccbe7dbc535c50a120df42256f70047",
+                        "s" : "0x3fe3bffa7aba8503a291168ff7781e6acbd4bbc7bd5a828e42f84f77fa77853b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1646g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1646g0v0Filler.json
new file mode 100644
index 000000000..35bffc3d6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1646g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1646g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61066e606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1a8ff00027154a9e8043cb437134a85dc85d98d401dd8114c406e81fbaea16b3",
+                        "s" : "0x403c7e153fde8de80a4bdc6be6022f60289aaec160d98f306ece6d1857aacc29",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1647g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1647g0v0Filler.json
new file mode 100644
index 000000000..040502044
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1647g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1647g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61066f606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb0dce5acd12d1bc5087b71f2a9fef7be6ee72ba553ba0d1d5e2383b6713ca61f",
+                        "s" : "0x14c149957f0c4d73bafc42934d5bef334355b2196cfa5f9604991a6fd444dfb8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1648g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1648g0v0Filler.json
new file mode 100644
index 000000000..fc535f534
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1648g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1648g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610670606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6c47dc4e00365ef092488adb3e6a59738a41953d77c3740ccb41cc3293b8d418",
+                        "s" : "0x16a0ec31c908c64dc59fc73f62cc3ced4c40fc0e3651c173b6086d30bd1ad678",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1649g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1649g0v0Filler.json
new file mode 100644
index 000000000..0191d31d5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1649g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1649g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610671606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x84e26d92735a7eec6b428ba18139c3b864907e4de89cbba73d12f535a58ceadf",
+                        "s" : "0x5056b2d8d77e96dfd181036cb1a49b92daa323934f737c5fba07c61fd4711336",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d164g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d164g0v0Filler.json
new file mode 100644
index 000000000..9d4337261
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d164g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d164g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60a46064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9684ad150891addd1cb7a2c54904b6a4b27c84a9f4708fdeb9cf25850dd25259",
+                        "s" : "0x78786a3e6784a542881d99ade900b6d3876f4bef6ef68dd6a0a183481930b79d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1650g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1650g0v0Filler.json
new file mode 100644
index 000000000..e235e0081
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1650g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1650g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610672606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x558a33358df410bd5322c82bb30c6c069d5b15d5298a0ea877e0b60f0c8c98dd",
+                        "s" : "0x6d4624bd9712c903f9c6cae6834c7e16c14594a898e56c13df2a8462d7716e96",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1651g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1651g0v0Filler.json
new file mode 100644
index 000000000..09e7aac6e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1651g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1651g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610673606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc1a787ba3109b29acd631e89b4a5ac2c3157655dbd4743154189b812c90ee5d1",
+                        "s" : "0x51b13b4eafcf7cd3b1155c342649c673f3cd196b7a689d2ca3367beb1512d034",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1652g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1652g0v0Filler.json
new file mode 100644
index 000000000..1747634e4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1652g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1652g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610674606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9104aa2f14043b07caa64fdb59856d5d231d951e8e2461792d93322c2b5b7476",
+                        "s" : "0x633de0c0202ffce16ecbd9413af7de449f469f20f6251e39ba9bb22b487b90ec",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1653g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1653g0v0Filler.json
new file mode 100644
index 000000000..d5891da8e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1653g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1653g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610675606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8ded9d946765345dab5fad83d543205de927273e611b83275146cb020346f91a",
+                        "s" : "0x4f5d3329acf8d3e1cdd314bdee7b7648deef26b3e26f9e2604489dc005ae7b7b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1654g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1654g0v0Filler.json
new file mode 100644
index 000000000..683f1250c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1654g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1654g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610676606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4ed49598f94972f07f58e944c538b0bab09d969115ba30c2822ea948ae9c3e60",
+                        "s" : "0x360ba03a7be6081cea43bbc114814a933b8df5a655af994e8e34abc6fb014208",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1655g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1655g0v0Filler.json
new file mode 100644
index 000000000..f84f8f866
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1655g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1655g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610677606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd548ef3000418acfab38085802c5bb2ca76985dc0a0774ee159868e40afe436d",
+                        "s" : "0x0da592138c521ab957490b70835288ab56ab358b5f4c9167d438f8a116127f9f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1656g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1656g0v0Filler.json
new file mode 100644
index 000000000..c8e44372d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1656g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1656g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610678606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0719b8d14544e0082502c00df5c0926a6d1f1996870aa5bf4aaf7a6574addee0",
+                        "s" : "0x0bfeea3dc031d0b57ca0a4e18727d83acc8fd5f2b0e4db2433424516d515935d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1657g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1657g0v0Filler.json
new file mode 100644
index 000000000..d21ef9f18
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1657g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1657g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610679606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xffce7d8255084563e9ee9a4ff9f65085e0c36806a45d83541e1a04f8bf3b0a34",
+                        "s" : "0x3153e7813a00fa5f5392c3eddd47c715dd64f54efffefbacdd934effa43306a9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1658g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1658g0v0Filler.json
new file mode 100644
index 000000000..8d008a43c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1658g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1658g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61067a606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeb4b235d6d7a970ebe1cdcca1656fb896ad503efc78dd46ca2f29201295aabb8",
+                        "s" : "0x7954f3e287b573cd5368d376628336e8a3e74315a835b36d1312deb917e8ae99",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1659g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1659g0v0Filler.json
new file mode 100644
index 000000000..d26560195
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1659g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1659g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61067b606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd08f0d55d662d47de97d910080af5fede76cffc0bd306d89e095c25b2386ee0b",
+                        "s" : "0x69a5f422ebb1cf4012072566e821575e0066b6d7e059050f5d5a9e9ccb5403bb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d165g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d165g0v0Filler.json
new file mode 100644
index 000000000..4f2956c6b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d165g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d165g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60a56064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfa819776e427342bbc94b116526773fd3563f0b72b1295a09c2d20962eb6c85d",
+                        "s" : "0x246f45d1d52b83dbe374ef3ee8a07b47ea0048defa40371d219c02e5636e9093",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1660g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1660g0v0Filler.json
new file mode 100644
index 000000000..1f47ee180
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1660g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1660g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61067c606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1317aa374e8ddafd1a7ea6533243bcc265f6a9510eb0328441061ab3257fd103",
+                        "s" : "0x06ba6ad48d945d0629852136bc97dbc8117462981bff1e60836d6f80d7f314e6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1661g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1661g0v0Filler.json
new file mode 100644
index 000000000..d72da082e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1661g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1661g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61067d606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4b60316f9f11bb8482a68fe4f35730b0f10b8ebd322e246ff00974a5b3d9928e",
+                        "s" : "0x598c0a0be066f81a7d94901762f1d7afb0a92dc8b9f8858d43afccb1a4855250",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1662g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1662g0v0Filler.json
new file mode 100644
index 000000000..03bd8f607
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1662g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1662g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61067e606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf47b5466e882b2e1036be6e7e47a66a49438a0e435b0180e97227ee42accb7f1",
+                        "s" : "0x539b8e8a318c3afad9f22f4117a20dadd11360bcca0ab1bf2e814c42adae0500",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1663g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1663g0v0Filler.json
new file mode 100644
index 000000000..a345316dd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1663g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1663g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61067f606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc51a7c9cff29dd99326b59156bf02b46a33bf28c40950971d89f2a7e8a3cc415",
+                        "s" : "0x019e71ea34e2d0cb4380d7cad240d33db71d76aea9ced2e2b3022aab57b94805",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1664g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1664g0v0Filler.json
new file mode 100644
index 000000000..9b81626b4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1664g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1664g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610680606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdad0f3d9d3ef66c374106cc21d818037decdbcf4983a9d161a0f52d17e748560",
+                        "s" : "0x116b15397581caeb83b29b1a7dccca5f910ea1ee2c4ca6d591e47392c99d83f5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1665g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1665g0v0Filler.json
new file mode 100644
index 000000000..40353a413
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1665g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1665g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610681606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfd871610d2b886684adeb5ab0acab0a1b40deb7f8af899f921d33b5f208b6eb7",
+                        "s" : "0x7b844d3ba8cde11a8cad52a7cfc2345c7c6d538f55f7f7ee3086df1c1b69bae3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1666g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1666g0v0Filler.json
new file mode 100644
index 000000000..c49f12d44
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1666g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1666g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610682606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc929e3c4d6af966b667a240df1d420eebd7635149674a2f8c8caa64465d1aa51",
+                        "s" : "0x1f882d661ec863bc7be8fb6c695f884e090a877c8e10980201353641d239e0e2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1667g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1667g0v0Filler.json
new file mode 100644
index 000000000..0c468065e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1667g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1667g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610683606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb3185e841e71e9a494b09a4b0e70ced9a75541b3358a10a14bc30d639dfc07f0",
+                        "s" : "0x0f3cf4ee19609696d05bd9845c543ba09231c546f1b02e887ed5ac18834a2503",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1668g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1668g0v0Filler.json
new file mode 100644
index 000000000..d32a5c52f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1668g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1668g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610684606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf72b64ca6bcbde91b3f1cb878244a27677ae1ff9ff0284100938672336706e89",
+                        "s" : "0x594bec878fe5006e0346a834815b4ef29a5fc93eaa77d2c08f4ab7bd7e6e2ea9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1669g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1669g0v0Filler.json
new file mode 100644
index 000000000..4543b03bc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1669g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1669g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610685606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf1cb868948f568b13e5e335abe3246ea5fcc478bb93f4532bb3274e8d7932c5c",
+                        "s" : "0x4f20ca34ec42a62bb86d02830889e08d4a10cac77f1e9c9d882cbad670201c5c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d166g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d166g0v0Filler.json
new file mode 100644
index 000000000..2d5f2890e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d166g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d166g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60a66064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc1d8841294b619db569d4cbd9d5ffe029f243cb683ce91443d06f174b6a0d27d",
+                        "s" : "0x34799347218252118d893ec4c8a3091801ac3a70b942440b2650d16632b3c920",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1670g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1670g0v0Filler.json
new file mode 100644
index 000000000..391a68244
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1670g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1670g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610686606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf96ce87b0957ec165510ab18da27f44f5d08e24619668d67be1f272ef8d8ded4",
+                        "s" : "0x5ea059018f9c512c8a3b4164613234e3b31aa72d80bf70c45c3b06a0decff699",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1671g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1671g0v0Filler.json
new file mode 100644
index 000000000..5cb7e3d33
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1671g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1671g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610687606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2cba50becc0fe3923255b371b9054044b77df19730de3c4bf0301a08be278a8a",
+                        "s" : "0x7904f2055b8971e612835732b0dfda97274646f4b76753ed5f7bce88beab73bf",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1672g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1672g0v0Filler.json
new file mode 100644
index 000000000..585508351
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1672g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1672g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610688606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x753c3ed808a190960f40f3b5032a749852a1137ce66230380238cfd0bea7a75c",
+                        "s" : "0x777d1b140846c0aca86048d2802766b2cbab73f68ba73e8b9127325f1bfd6850",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1673g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1673g0v0Filler.json
new file mode 100644
index 000000000..79d2ef2fa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1673g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1673g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610689606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x94e65201d77fd2ac704ed33baf5bfc548af785529963f55a7c07de581255ee20",
+                        "s" : "0x4d8db6ef0ccbf0559d9d93267070a0def4e2fff197c4d329e15ccb72315fd10a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1674g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1674g0v0Filler.json
new file mode 100644
index 000000000..4f70b162d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1674g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1674g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61068a606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb8c9666de180fbffe0edeb064d1bfe85d4b1fc884bf2077ca5bf6f67cf033f1a",
+                        "s" : "0x7acdb3c0adc0c03d0a84923cba82e54a5ca7e0f04dfd910df8a16bb46760a77a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1675g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1675g0v0Filler.json
new file mode 100644
index 000000000..3eb1582de
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1675g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1675g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61068b606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9bc94233ea20de81cc2b287d64f29df99bda46808dd543cf9aac4f5d3e990d90",
+                        "s" : "0x34410ae4437e4af0cec476d263ca6c73e6adf036acb174d3ee91ef4e1fa7515c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1676g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1676g0v0Filler.json
new file mode 100644
index 000000000..3926c6307
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1676g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1676g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61068c606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1759ad8987a99141b49af24c45c1786439e91a0b3df7e885993832ff1df6dced",
+                        "s" : "0x28e01514378eb67a060166ef69990239f13fc6fd3136a01d65252ac62aef6cbb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1677g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1677g0v0Filler.json
new file mode 100644
index 000000000..990ae0326
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1677g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1677g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61068d606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdce924e7602dfecd1ba3ca9f42987efbce0469dd1118171cf1828828d5479af5",
+                        "s" : "0x0b217c653604951cbedaae7a4918e7c5a36929ffc1f7c59534d145e8a13bc220",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1678g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1678g0v0Filler.json
new file mode 100644
index 000000000..690f5051f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1678g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1678g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61068e606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x35db50826f1a46edc4edb80ef7517c7731692d6dd78291c82247ceec16d14a62",
+                        "s" : "0x736523382f7ee5d949daa92b8b176d9b1fb05ee835a8629b7b05c7187f9c69ae",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1679g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1679g0v0Filler.json
new file mode 100644
index 000000000..cf1c52dcd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1679g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1679g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61068f606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xca3f7b6e5a1b47bdc86b836e76862cd66a8a8d1ea70b85e2d138f8beed7668e2",
+                        "s" : "0x2007fe65982074b0a90a34ef370a696345f47915e4d52df3b5591e61470015d2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d167g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d167g0v0Filler.json
new file mode 100644
index 000000000..0d0ce667a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d167g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d167g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60a76064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9e5423cbe8670aa3c36440434c429749b82d38111f9b9758e3edaff7f3e75b2f",
+                        "s" : "0x54d81cd48f3b736343b8a4f688b0d09525febe0c407da5bbb2d36842cfcedf74",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1680g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1680g0v0Filler.json
new file mode 100644
index 000000000..f7a43dcac
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1680g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1680g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610690606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd19757ad08b604bcae974dee5fe176aac9a6647b23fec1c7fa147f4864379647",
+                        "s" : "0x4b892d84cd91593d41caf46e7739b08e557708ad6faed78059096c4595d3cbe0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1681g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1681g0v0Filler.json
new file mode 100644
index 000000000..39efc9d9b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1681g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1681g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610691606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0835b0fdd8a4023e36927fa1928fc430de5102df19f57663055ace636940c229",
+                        "s" : "0x542faed62e704dfccd8e41c748e471c7c3313134c6440a55afd3121d7bf74180",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1682g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1682g0v0Filler.json
new file mode 100644
index 000000000..909edab90
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1682g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1682g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610692606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb5ffd1383759390555492e33cac6ef5e8ef282076a69525257a75072132d510a",
+                        "s" : "0x0ef1cb06eb1b70520885e0da1fe6a0783179787359b039a4061234c5a932271c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1683g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1683g0v0Filler.json
new file mode 100644
index 000000000..8bef03187
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1683g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1683g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610693606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2364586c55faf48e56b9c933df3b5bedbf0f0cca698b3c4328edc6dedd98dcce",
+                        "s" : "0x6a0b5b3483f53acd353c070885c3659c6e0f114e78848a7cd422dd93defeddef",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1684g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1684g0v0Filler.json
new file mode 100644
index 000000000..6f921090f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1684g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1684g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610694606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x202dcf9df622001134f0ff80367bb2c7cd2474815ff721c8f9e0fdc76fe157a5",
+                        "s" : "0x743d71766e4cc6e67bdd9080f0ecb9a7baac7993a3e19c296363c2668be2c082",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1685g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1685g0v0Filler.json
new file mode 100644
index 000000000..1a1cfeb0e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1685g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1685g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610695606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x927027f847a9731a60a30508da8149cc2bc3b56f419bd6ff5bf24e5bffd0eefe",
+                        "s" : "0x05dbeca05038c14a04fb0726933b92ac6ca89f4527976c4ea86c87bacff36ba3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1686g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1686g0v0Filler.json
new file mode 100644
index 000000000..b675bbdec
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1686g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1686g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610696606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x33074efad0d9692d8eead868d0ed853281008ad0a22f5e96d8af32d9ef28ac21",
+                        "s" : "0x3f15f5da5f5d807adeed483f33d4215fb207c0865872d6a526d0404685a3f466",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1687g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1687g0v0Filler.json
new file mode 100644
index 000000000..4af22ce52
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1687g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1687g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610697606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x136d334adbe045883b3a99b02c33ecf269cab1717f5f07686afd98053375b651",
+                        "s" : "0x3c32693e0c2cb6b3b525f5665f0f058603ec653ffac7aa00786c9232f69522e1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1688g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1688g0v0Filler.json
new file mode 100644
index 000000000..2366606a8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1688g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1688g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610698606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x29806b86de76ec436ac8f53fcb9766ab87dad5d681cc1ce81f8b2a65df1038c0",
+                        "s" : "0x2f5c1be96805ce9402a99d71a77658fe7f95301a317dbc4195126184b510fcf4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1689g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1689g0v0Filler.json
new file mode 100644
index 000000000..aecf8aaea
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1689g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1689g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x610699606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x04d23687bb24d8144538f16d1598cf0646ef8ec18206cafecb598db1cc98f07b",
+                        "s" : "0x46e09bf1fca914d7e84a179fd47ea362b8c67c607b786a64154b66c79d165ddc",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d168g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d168g0v0Filler.json
new file mode 100644
index 000000000..99fb1dffd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d168g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d168g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60a86064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xca8389c7e704f1835c4f449fc2bc82bd64180b7a98595053d6e05ac25b63f3eb",
+                        "s" : "0x1c915d93d7cd816c3066cda082254fcd362446338108a832dbbeaedb3159288f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1690g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1690g0v0Filler.json
new file mode 100644
index 000000000..cb52e2b85
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1690g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1690g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61069a606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb82c1b251441744951ef232cf6fc6c69f8b97976ed7ce0a8bb5814479aead326",
+                        "s" : "0x463dbcb34318ea16c85cafa688396392c7b1bf1a2d4c4ec69c6b57bd9bea1032",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1691g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1691g0v0Filler.json
new file mode 100644
index 000000000..6ca077d80
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1691g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1691g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61069b606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xda29b4e138913b89294cd9927fbf0ecc739421e72dd0cb404d775a346f5b3171",
+                        "s" : "0x072e29c2b0ac79c9396648aa052ef8c9202df3888a1af37dccc4735f62147f71",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1692g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1692g0v0Filler.json
new file mode 100644
index 000000000..e155940a1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1692g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1692g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61069c606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xba0d9363e06cefc821fe55569b875062fe539401fb90eb76f5f843aa5f50b506",
+                        "s" : "0x18c3139eb93b4da4a62fdcdc4b81ac6c485cb3ff6c5cf15a9c855c2fdfd222fc",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1693g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1693g0v0Filler.json
new file mode 100644
index 000000000..7e194bc8d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1693g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1693g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61069d606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x98a6da1f278b574aaf15b80591a9b9a8aa9207a136039b33f9ea07ccd4e5fb69",
+                        "s" : "0x4deb6f04bd6d120c020ecd4b33363f432485361e0a943101994159c625804a30",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1694g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1694g0v0Filler.json
new file mode 100644
index 000000000..67350a462
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1694g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1694g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61069e606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x713f73b9d8fc130040d2cdc55b2739a79890c1d6180d8783e65c38d987bd33be",
+                        "s" : "0x7517f51c04714ae2b30f2b2446e977cc88502cda95861e481578bddf8e316bb9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1695g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1695g0v0Filler.json
new file mode 100644
index 000000000..07809f911
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1695g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1695g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61069f606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb6f2c3500f90e33ef5b68abbf9719e713b84a6e92163f955e5343b0ed038bbca",
+                        "s" : "0x2cc1f63d9fc8ac6b0121c61ccb708aaff9314a09a9ccfb9e788581899a616a8c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1696g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1696g0v0Filler.json
new file mode 100644
index 000000000..c39913071
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1696g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1696g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106a0606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7e6842422a9ce5714b3b2ae538f9bdd69f189b890fe4f15550c5d45c9610a4e3",
+                        "s" : "0x46934899270ea566b1e4512389fb9203b6eeb543f0cd82cbdf915cfa2e84565e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1697g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1697g0v0Filler.json
new file mode 100644
index 000000000..9947347f7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1697g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1697g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106a1606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa9b74413de1f69c751ec713804eb01e75e50b2b35e9c804a18dd594ffed88894",
+                        "s" : "0x22b369f46a5d66026a83e60ac9181448758afe4af5e00db635592da04680bc0d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1698g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1698g0v0Filler.json
new file mode 100644
index 000000000..1067ec7e2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1698g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1698g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106a2606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x451083c6bda4b98c1d01dfdb733168742ca1a534131875ac81ca6fcc60dd1ef2",
+                        "s" : "0x20fdcede4ed262cfc602cf21789e4463948d3a15fd11a756d47ee25542f1323c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1699g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1699g0v0Filler.json
new file mode 100644
index 000000000..42b67d4c3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1699g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1699g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106a3606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbe043f397a2cc9ec027fda7e0b9f7d5b20957731f27d11aca13be5d4b67d0d0e",
+                        "s" : "0x5a28a03488dd834fb3996682910ed20a824b42db82eb526cda0bb20bdebf18da",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d169g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d169g0v0Filler.json
new file mode 100644
index 000000000..f61d9fdc4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d169g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d169g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60a96064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3c2478d49ddcd02772a0a04f46460f35a389667ed48c1da46dfc0dd86d99bbe5",
+                        "s" : "0x63b772e6082f0eae6ba465905760566c128ff8f80188e03415ded9344a75d81c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d16g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d16g0v0Filler.json
new file mode 100644
index 000000000..6a56deb0a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d16g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d16g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60106064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe342579e6e1449c8e3b00dfb6d0390aeac37983198a0c247b3b426a5740c330e",
+                        "s" : "0x420a581da210ea814bd7193dbbc611d191284efd1f2afc380b00a61af5e6d90c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1700g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1700g0v0Filler.json
new file mode 100644
index 000000000..b8a15b135
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1700g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1700g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106a4606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xee2f96d3b0005c1e8745e0d347ab6be0001514eb2481a2f655997a1dcb69165b",
+                        "s" : "0x537af06145ca181345f75cbae9efff3d15a082efa9f9f50c73ffef44f81aebd9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1701g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1701g0v0Filler.json
new file mode 100644
index 000000000..e74b165d5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1701g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1701g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106a5606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2a3b2995dc1a9a0a63ab04ff141f8d6931b54e3991b5e1b39bf7a885e0c0d3a6",
+                        "s" : "0x38ec79fea48a01d322fe81b69a0045690a679599570891b40b9d71852a067126",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1702g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1702g0v0Filler.json
new file mode 100644
index 000000000..7a918da02
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1702g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1702g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106a6606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x042a10fdf9f97dd9c907c868db08e66114a58818d7a53e62e0a1bb35024be260",
+                        "s" : "0x5fd1b767778f8591a9573d048ba695dca2cc326fc0a4f53eefb8687e6fc4ab2b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1703g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1703g0v0Filler.json
new file mode 100644
index 000000000..4e303640b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1703g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1703g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106a7606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x290ed0a77d47b9c0f2334adc6b33bf777550915651826ba2b29aea08a2cf495e",
+                        "s" : "0x587e6764178dee107d4b307c60c6b8566a034c278c0d2b637a7df057bbbd1c2a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1704g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1704g0v0Filler.json
new file mode 100644
index 000000000..58e811b95
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1704g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1704g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106a8606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1d6700ea3e3a44e9a30a04c1300eff0c3a263fcb20f610af2e5aa724dea9208f",
+                        "s" : "0x20a77527ce47d8512fd418996bc298f528b0e1710a38fde756f2ca5946e725d5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1705g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1705g0v0Filler.json
new file mode 100644
index 000000000..a95f1fedc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1705g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1705g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106a9606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x59b648751a912a8211b2500b41666f3c0c6bd686a30ec7583a23a7272962228b",
+                        "s" : "0x708786893d94054fe8e3022ab27011a2766f188a26b77b6f03d944985f5468f3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1706g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1706g0v0Filler.json
new file mode 100644
index 000000000..6aa36e927
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1706g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1706g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106aa606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x406b1faf7a677684945990d0c0d373164a83faae0a135aba0fbca2f616916667",
+                        "s" : "0x08500d4efaa54fd6cb1ac15ba60581c31f84e84e21466564790f19f4a675fee4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1707g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1707g0v0Filler.json
new file mode 100644
index 000000000..f82c4ccb9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1707g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1707g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106ab606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc5c020d6eed6f096e6798c2b9418f810d241909b7ea174e4776c162e3b125f87",
+                        "s" : "0x6a0ed36ad072b80950f251cdcbb59392f164209505c4235f55500ebb05dc906c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1708g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1708g0v0Filler.json
new file mode 100644
index 000000000..7d73cf4f7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1708g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1708g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106ac606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xce849ab977e1562fa2da37adf3a993270861aafcd0928b1b3aba813eadb75a64",
+                        "s" : "0x4c15cc8fabb849d333b677f251d16e814794aaffd5787bf8b720a7c84cd3112d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1709g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1709g0v0Filler.json
new file mode 100644
index 000000000..d71f43264
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1709g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1709g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106ad606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf717f2bec26983fb45b5af36eda9914eb7b565070873246b5ad05c10ab1c5e1d",
+                        "s" : "0x53bc8dd6481e0033fae3631841c5757616fc4876d95aaf21f8d042d2e9087749",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d170g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d170g0v0Filler.json
new file mode 100644
index 000000000..e60a49492
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d170g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d170g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60aa6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4854d09767b2b7e4b143efbae5ffa76b0e3906a69c55133c8649ab4de4e2ba12",
+                        "s" : "0x355342f562a199fd1c71ca7db94ef85faff5df751f5fffb59933879121514873",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1710g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1710g0v0Filler.json
new file mode 100644
index 000000000..0bcd7a066
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1710g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1710g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106ae606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf43148ac50c579ed084030818b6d2d39623279f2c15652a5ac7142b003a76eee",
+                        "s" : "0x3ffc7979cbddc956aa2258b2bdaf2f907dba2b05bd45ce02ce0b989a0c641ec7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1711g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1711g0v0Filler.json
new file mode 100644
index 000000000..e845ee7ad
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1711g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1711g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106af606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9480cf923bc494c7ca4bbc5b6ed796772d99d6b97098fc0eb18e987eaef076d0",
+                        "s" : "0x7863aef03d74f40b1208d370a54f4ee315fde56037d47663b4fb0aafa625191e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1712g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1712g0v0Filler.json
new file mode 100644
index 000000000..99bfc9794
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1712g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1712g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106b0606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x09b5f0902c2d4cf4f367b718b000dff01d36257dcafcfa3836f10d300e04c4d7",
+                        "s" : "0x372f87c67da67c7823ee7ffcc3dff1ed93dcb563278eda7b111008d14a82f68e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1713g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1713g0v0Filler.json
new file mode 100644
index 000000000..8ae6e612d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1713g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1713g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106b1606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4883a3cb2c4b1e3eafcdec8ca37e8c139a35d6b9d5afeb4e11f15c994c3e45e7",
+                        "s" : "0x0ee0d71335b08576f2b29b741bb8a9b5512654849f4d352cc173db42106cf1c4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1714g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1714g0v0Filler.json
new file mode 100644
index 000000000..642325f3f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1714g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1714g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106b2606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbd1eca7043037afff053578ba7b40b76065cf0d64f1c0bf80f11bf56dd76039f",
+                        "s" : "0x0e9e2c11dc6a5d210f50583925e13cf7b73c0164bfab09736477c1290751e342",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1715g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1715g0v0Filler.json
new file mode 100644
index 000000000..855cc5b84
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1715g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1715g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106b3606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe027df46145621d294047a5c0251a06d7d335df1e9c3bf2428dfe3a32b6b2b54",
+                        "s" : "0x569bf88893b86310e443b34452f183a2e56e6a789fa82c97f8347d982147013a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1716g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1716g0v0Filler.json
new file mode 100644
index 000000000..747ec73f1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1716g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1716g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106b4606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0254507ece73d9a1a4f0266910670cdfc291f772216e4a78aa762ebae25ee348",
+                        "s" : "0x5314431827764cc56420a739520a016ea5c584107646b942262d56a31abf1fff",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1717g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1717g0v0Filler.json
new file mode 100644
index 000000000..f7b186b88
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1717g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1717g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106b5606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xda37de4af170c38a67c45cbafa6d080f8e92b06fe727782e18c7d4d95d160cf4",
+                        "s" : "0x01922c8a2f7307733be76f5b46ee4c9ca831115d113369dab6823cc69d36ae47",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1718g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1718g0v0Filler.json
new file mode 100644
index 000000000..154bf82f8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1718g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1718g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106b6606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe7881a7618c3a15b4e7cc113b314ae716d961d9b53ea9833f30d2f188bc1afa7",
+                        "s" : "0x21f6cabafbe2e2d74ef20c65d6f16bb842e70617d1f2e19d0348e9142c49b6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1719g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1719g0v0Filler.json
new file mode 100644
index 000000000..aea36bc16
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1719g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1719g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106b7606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa44d00b832aeef450a70830232b3a02ef167e77c65f0009845fc50a794fd24f9",
+                        "s" : "0x2fa6a2ecc56d499af783254d2ef1003a07fc120fb3f8c63a2e5a356ff975ea88",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d171g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d171g0v0Filler.json
new file mode 100644
index 000000000..433e7048d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d171g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d171g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ab6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8bb7dcf1e836bedeeb0c1399a339d9b72e0b351cb2af09a0f3d8dcab8cc4504f",
+                        "s" : "0x4950f3d3f72ad8b6c664a21318da4130d6773481ad9503ef6af539bb5de72fae",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1720g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1720g0v0Filler.json
new file mode 100644
index 000000000..132ee61cb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1720g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1720g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106b8606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xec078e7fdd95a8b54f726ecf23d773342b25ae14dced43654e64dd467ed642e3",
+                        "s" : "0x41c5b4407c5c69c9c34fe85854cbbcc85e68821ae7b9e2358c2559da53d0ec4e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1721g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1721g0v0Filler.json
new file mode 100644
index 000000000..d89789f2d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1721g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1721g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106b9606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0d2cf8c89b60add308b87059c771c994406420b37feed7b37159c4470a26b06d",
+                        "s" : "0x5df9f16b61707d04a9e527fdeed30d91573a29b59ad5326a986900ac271e7e5a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1722g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1722g0v0Filler.json
new file mode 100644
index 000000000..9d2bd4cce
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1722g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1722g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106ba606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x01ba3f2411107b1be7c9b5c7db5501bda89572bcc00febcd887462af2ef5c18f",
+                        "s" : "0x4f681eab35109c0eb9b61817be702cd28252d7ed4ba29a0487b24902e556c8b5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1723g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1723g0v0Filler.json
new file mode 100644
index 000000000..b1bf21124
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1723g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1723g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106bb606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc39e639c599407be437ccc4e012a8a1197e5496553aca77640ea4af7ddac744c",
+                        "s" : "0x5668ead2076c6281341151fd879b5254bf1a6ac7a50f655e9478601654d340ad",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1724g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1724g0v0Filler.json
new file mode 100644
index 000000000..1bbfb96d8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1724g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1724g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106bc606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x40bdc8870e49bc58342bb1cf4a261fb1fd5ed32477036876a17533c0bff0a55c",
+                        "s" : "0x5a0283f5ca371830258da960772c2a43875cac656a4a90fde59ca5ad4d194077",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1725g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1725g0v0Filler.json
new file mode 100644
index 000000000..50ad4bbc2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1725g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1725g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106bd606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x31464809280256b32c13e1b2f0c22145c46261897d4a4a8cf39e3f59560d57eb",
+                        "s" : "0x7a4c86cf48da3c1820c526f93b9d99c78f17fc76cd04f2b4ba6b5eab2eeb1247",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1726g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1726g0v0Filler.json
new file mode 100644
index 000000000..090c9fd8b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1726g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1726g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106be606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x488b91cc6a3fcaecfd40d64366905f263b18f1b9f43e2359a12be6d7a5407d6c",
+                        "s" : "0x752dcbd57dd9f64dbe702fa6604272eb36a8a6417574a588537087f6eb0591ea",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1727g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1727g0v0Filler.json
new file mode 100644
index 000000000..7ea1d422b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1727g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1727g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106bf606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6428b0f7cc317d8b48d78e2a7425a7e2b741a54e251507445897a07880211b11",
+                        "s" : "0x430cc96cf61d74c94e2d4fddd51ad791a9813aa6ed4f00d81291febfc8ecb4d1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1728g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1728g0v0Filler.json
new file mode 100644
index 000000000..143080df5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1728g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1728g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6106c0606452600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x743820ce707c06f3f737cd3f09f8e3af02b234a024605d39c06bef36d1ed14e5",
+                        "s" : "0x591e76a5cf61951eaa568735fd0d50230225bf5fda2c74feaebdf426309e3406",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d172g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d172g0v0Filler.json
new file mode 100644
index 000000000..fef2c88e8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d172g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d172g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ac6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc90427dea61db8f5513d2a4138ac587d13429f834672d36ca74f1ae741a6fc",
+                        "s" : "0x15d96056695564095d526c11b67ee49a7abf070d33c8501b72aa0f6c624a3758",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d173g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d173g0v0Filler.json
new file mode 100644
index 000000000..4d36c57fb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d173g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d173g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ad6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6fe4bd8f34fdbb165ff81f1a2cae42f18adb16fd880302380015e344d9a05714",
+                        "s" : "0x2487dfee73ce8573fa8545e6952424d32ea10542002c61889444b6066e766661",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d174g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d174g0v0Filler.json
new file mode 100644
index 000000000..1145e9368
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d174g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d174g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ae6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xde051ebc5b066e001ad42b52279b6b0198393fabdc7ad0c2493609de1b411592",
+                        "s" : "0x352ffd74060e119c47374277cdd453ee27351733b0175b2f21e8a31665022565",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d175g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d175g0v0Filler.json
new file mode 100644
index 000000000..de85c3550
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d175g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d175g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60af6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0c678e36de1089fd10a86a95fb0324ec8c450fcc007aa5b1c84105ffaec1ea61",
+                        "s" : "0x42a41927ea2f9835108372f23c2ff73363969867286527ba6eeab0e787a7d454",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d176g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d176g0v0Filler.json
new file mode 100644
index 000000000..806bb02b5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d176g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d176g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60b06064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6a9c9d44e507824bdd4a89910f6bf848e821088c3ec873ad681563011b4860d0",
+                        "s" : "0x71153618de0c167b930b538198fce0f32e214a428958ba50bc8812dd0a59a51b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d177g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d177g0v0Filler.json
new file mode 100644
index 000000000..f0a40d6ff
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d177g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d177g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60b16064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x939f365eced2dd1a7c42016d34336213992680f22a3543a4ded44fab47d11635",
+                        "s" : "0x154c60d237d26c817da7a92d0dbdf4e7336fe7879306ebcc286b57b2425bceec",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d178g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d178g0v0Filler.json
new file mode 100644
index 000000000..15ee6cba3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d178g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d178g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60b26064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd1ebf28d05daffdde9188e86c5ec6d9421452a0d6ecc0c06562513dddb1a2065",
+                        "s" : "0x1dba38786e6ef656e7f899099b08b6c1a0707818072927a8696321f97e57b30f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d179g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d179g0v0Filler.json
new file mode 100644
index 000000000..c87471fef
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d179g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d179g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60b36064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x42401221f9126b9fbd798f247e8bed282a43b8592a285abe9da03902bf25a1fc",
+                        "s" : "0x209b301336e2ea47bcfb362be0ede45a67076422304a6c3e4733b39c9e74014b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d17g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d17g0v0Filler.json
new file mode 100644
index 000000000..99eeca916
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d17g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d17g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60116064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x527442db786cfb0f5bb3dd7d004ed968247b0d342d9d4f250043b4de109eca86",
+                        "s" : "0x5eaa669de7ba80b9a6abac89e2d41caf90f701768f49a214795975e31d96c721",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d180g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d180g0v0Filler.json
new file mode 100644
index 000000000..ff172df1f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d180g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d180g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60b46064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdacd6df4a29b5d1bbbb1f19a67e6e13e94dd29729518a56648011d31d54394f5",
+                        "s" : "0x3a281c78483f40a794c1929b4ab8572d94f6df545bc0bf3f512f1cab8e5e6edb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d181g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d181g0v0Filler.json
new file mode 100644
index 000000000..dcf35112b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d181g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d181g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60b56064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb785563353da9c61dcfcdd8606757ca8bfa269ea8df29409ed88e6bab6a7b30f",
+                        "s" : "0x232963701a8c45ec9a1887e95376d9bba52e982ade46db4a62e8eac6827de5e4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d182g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d182g0v0Filler.json
new file mode 100644
index 000000000..0eab47ff2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d182g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d182g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60b66064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6eb79aa8464cf867e066074808a9f1762d235cc225ba76b9598a30c57fcbee83",
+                        "s" : "0x3a52f70845f2d089b464021aac5a0593e929b0750e516d658e2c892be2e0ec8e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d183g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d183g0v0Filler.json
new file mode 100644
index 000000000..a1cd2e27b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d183g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d183g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60b76064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xed6b5c6da322080670cb86e241d34025883603c2e88d9005dd616c1c7c7507ea",
+                        "s" : "0x1b1dec450da5c50f5d9dc4234f7ed8a93d0df69cb47f1c1afc072977d230a2be",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d184g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d184g0v0Filler.json
new file mode 100644
index 000000000..11fc1adff
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d184g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d184g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60b86064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x914de00b684d69625515aefb950d80a7eabdb8a41de397b4983f55ef935535db",
+                        "s" : "0x1994755187a95d637c29272a6d222a3a7499a41c201937d782ad343fb561bd18",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d185g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d185g0v0Filler.json
new file mode 100644
index 000000000..50227a977
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d185g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d185g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60b96064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x47fd5bd2506de8c9b4ff2f9f439d122f489f206f299b64a6009e6b5d3b942322",
+                        "s" : "0x589621667b45839a34d498b685f674ca1567d9fe455c625a3f359ba23e160c98",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d186g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d186g0v0Filler.json
new file mode 100644
index 000000000..e654b5425
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d186g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d186g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ba6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5a2436bfcbef3f290702849a6e619932bbe34dc9fb8874ef28d7113eed7f1a64",
+                        "s" : "0x5827d8a867ea3b0fbdcc214f9d22c3570397c80ce0106acc484a28b730b1d875",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d187g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d187g0v0Filler.json
new file mode 100644
index 000000000..35a2e45b3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d187g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d187g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60bb6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x740ca21855f4dd8848369cbf8e63a1d6d4aa9e6130d99634e74146df347334ef",
+                        "s" : "0x260e2338162d8a4ce57bfb3763ee75ee79ffd566d867e57e3f0c4e9c40532a25",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d188g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d188g0v0Filler.json
new file mode 100644
index 000000000..b2c2853c0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d188g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d188g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60bc6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb614f8de39539f858ac92edcd9c624705ca39e5aaaed347b09610d617ae57710",
+                        "s" : "0x729fb804c1d6fc9364849edfcc9cb9ba322fba7ceb0a92d09a2a2d918a8780e0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d189g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d189g0v0Filler.json
new file mode 100644
index 000000000..e2c510bf1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d189g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d189g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60bd6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x68e2ce395786d9a80af73cddbce6517a19109a1820d20d8b3a2786ed2a243290",
+                        "s" : "0x6422490d9937cb8a499ea9f00bc9ad71c5bd6b9c2eec1dcdfb77c7eb765addf4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d18g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d18g0v0Filler.json
new file mode 100644
index 000000000..96faabd71
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d18g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d18g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60126064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcb145c01d6beda4b3686a000ea6af4bda3d1ade8c26f527b559a01344e73ad5a",
+                        "s" : "0x3d0e683b8d92da3067ddbb86ea4ac8010cd8319c79450d890470fa50b4f2ae1e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d190g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d190g0v0Filler.json
new file mode 100644
index 000000000..cfeac513a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d190g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d190g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60be6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa39a721b3ecb39ec0d7b67c6871eb97288d4b2779bda3b698c2a3f4a44c99c20",
+                        "s" : "0x2249e93e06331becfaa4a854a5862a1631c07e422de7e9a54053045ad4ffa7c0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d191g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d191g0v0Filler.json
new file mode 100644
index 000000000..1298cab54
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d191g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d191g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60bf6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x15417d97025b5199e629e7fb2fecf134f996b58c957917a583b9db70eeddaa5c",
+                        "s" : "0x02ad4d1506ec062ca270f8eb2875257fcd6947983269b04f63b0bd2c0103f01f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d192g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d192g0v0Filler.json
new file mode 100644
index 000000000..62ef0530a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d192g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d192g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60c06064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x20a4c410d3f6266c7052d49208fa0d44f730df2273fe9702ed45c3eaabe73fc1",
+                        "s" : "0x388c81c11600ffb0371f9ea9e9191eadc1a37b5393644774d594a2be6f90317f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d193g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d193g0v0Filler.json
new file mode 100644
index 000000000..429452d39
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d193g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d193g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60c16064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x97b4f313fd04dcbe93374bec23ed6bf0d7d6f1992c7519cd74bf16c0a27b114d",
+                        "s" : "0x2265ff17927ce12c37994cd9aa71bc69fc60a9b686319e5fe164b4f4e37481f5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d194g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d194g0v0Filler.json
new file mode 100644
index 000000000..8d7ac6166
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d194g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d194g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60c26064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0e5cd4dee0b2388908536b5d8c3552089ebd5f9cc23291cb22040e1fdde9aa81",
+                        "s" : "0x67587b8123d49e96be766426bdd434254aad8a503b382d7543cfbfa470f0b584",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d195g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d195g0v0Filler.json
new file mode 100644
index 000000000..c35e2c036
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d195g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d195g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60c36064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8495048cf32132344d435414faeae449f3cb0e637381285eb5432a5b44b89337",
+                        "s" : "0x4f8df0fe3b298378cf771286ea3b2b5feb7c6da1b1063ad58bbe055a998c8d35",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d196g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d196g0v0Filler.json
new file mode 100644
index 000000000..750ddcdca
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d196g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d196g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60c46064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1316bc749ead2897aa18f61d65e4d5651bed2c6e44c5fde80dd01212fa3a938e",
+                        "s" : "0x7d99af29da82e56d4fc352831f7b55601e2ae3365891baf3c28ad614ea79278f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d197g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d197g0v0Filler.json
new file mode 100644
index 000000000..bdae58432
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d197g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d197g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60c56064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa4948fcf59cfa063b33f6eb223f7703fffba6cc79bff63d7a946055274578c0a",
+                        "s" : "0x65f4e7b1030e883d7bc7e7b66fe0fd5aaefb9b4e738dea598ee0770cfac02f21",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d198g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d198g0v0Filler.json
new file mode 100644
index 000000000..4e728b001
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d198g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d198g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60c66064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf97e69655b07c92703073521b9c39b79a66f8f7a0b302efa818345bb976de3b2",
+                        "s" : "0x07e2e250d3d2674828715f63e50fdb0c8da4e4b01e6bb2d8783dc19c3d049e9e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d199g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d199g0v0Filler.json
new file mode 100644
index 000000000..33cc44da6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d199g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d199g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60c76064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x613c1247f08ef37f25619c8ce8f8d7c1fe38d63ee0b38069f06e87b8012d543b",
+                        "s" : "0x791fae71476efece36b1b187792376afde08055ec5521ec43f07a1add3c0c398",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d19g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d19g0v0Filler.json
new file mode 100644
index 000000000..d8102c5e4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d19g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d19g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60136064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe0b76c69df96c1b1a79b64de889fe3ecb791ec86bf80058cf9b5489ba3056e93",
+                        "s" : "0x7a6e8e9bf2a5931bdb58ee264b2325977b4ba4d0f8b7b4c14feb3b4546c3f21e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1g0v0Filler.json
new file mode 100644
index 000000000..275fac1df
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d1g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d1g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60016064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x06d2ec1da2bf2d2b9902e2f4c5c9e7037b0da5810b15896cc4a05344e73f4157",
+                        "s" : "0x726817cbf44cfcd4ab89eb0ebfa4141ab4231c3373480004599c6b77c6496c8a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d200g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d200g0v0Filler.json
new file mode 100644
index 000000000..dbab99e32
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d200g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d200g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60c86064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2302ad79663103a6357934b196f6f0d3924b4e72f140f0c2ef7b12fa66c0c5b4",
+                        "s" : "0x4f0a7d0e24beee09f11cc4235ddad6805c0db574b11944e633778074b1cc3556",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d201g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d201g0v0Filler.json
new file mode 100644
index 000000000..76968715c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d201g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d201g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60c96064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf2f70b80e83c2805fc7fa446205f0bd566096e5a33bf7ae3582da440b011ad48",
+                        "s" : "0x042f7402da11b6f5756e3afc776463bc9b69086a683bd33cbf0a0fdf6e183172",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d202g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d202g0v0Filler.json
new file mode 100644
index 000000000..cad856562
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d202g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d202g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ca6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x10c0689acba1e932bb82be0bb39733e47f0c8a145fb38d073d32d66a928b098d",
+                        "s" : "0x093cca52bfa0e6db9419e9d4c9e399267a6bec0f37c7a511b3c02fa7e155d2d5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d203g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d203g0v0Filler.json
new file mode 100644
index 000000000..1accf7bb7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d203g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d203g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60cb6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8965bdd5964b379f56198e61a8b7b4b89054be714d44e213e9ad9169410f24dc",
+                        "s" : "0x7fe98fb694ec2bb389be54780022d0b4c43006f12a0b848b3247bff9673c016f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d204g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d204g0v0Filler.json
new file mode 100644
index 000000000..26f4b5ba3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d204g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d204g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60cc6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xde9e08d6fef7197fba48b58357848b4f235437d1f3fbbb702b3c5e107a585cc6",
+                        "s" : "0x7a13afc25536bfffae905fd7bb2fecd8dd4e1cadfe9b0a50e53a24a74bf9a7c0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d205g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d205g0v0Filler.json
new file mode 100644
index 000000000..c8269013a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d205g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d205g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60cd6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5f6c8d7a98b467c9da35aa7acf86cb6c75f73dcd832e899046740c9a649cb94c",
+                        "s" : "0x351921b1479e7acbc15676d74029d31ce7b10021ae9589da33649e2ad9003d04",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d206g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d206g0v0Filler.json
new file mode 100644
index 000000000..16ae62be7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d206g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d206g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ce6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1e2ea52701ba4497aad26844c7c161948dcb687cec738812c7ba77d75e644ebc",
+                        "s" : "0x0a38ab19748c97b536f9cdf13d64b5ca155057d35d08ccefbca55817ea1ba07a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d207g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d207g0v0Filler.json
new file mode 100644
index 000000000..2f72ec166
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d207g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d207g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60cf6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x23e59524cff2a5601a8b5054f0aeeac54b30fcc31e55b4d389d0687b40700221",
+                        "s" : "0x4682431201a21e9ca02666c6b5a2d7851de5a0fed8ede7bf2157008e9b5d500c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d208g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d208g0v0Filler.json
new file mode 100644
index 000000000..edcc8d424
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d208g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d208g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60d06064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdad2b0ee573f592cbde6e4f0ee79409271654580fdca63959a4593e8ca21b110",
+                        "s" : "0x30f82fca6d82a1d34bfdbc9ffe196bd81b26e7cdcf201bb080efd9dba34143e7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d209g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d209g0v0Filler.json
new file mode 100644
index 000000000..32a355bf8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d209g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d209g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60d16064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe7524d416c094385da3b377100f1a65a1d5f357e1fa4794261311162c2563862",
+                        "s" : "0x09229c2aeaab0e3ee45cef7084c347c34ed7f14fa5e096b0dab0f4cb0f3e37d5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d20g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d20g0v0Filler.json
new file mode 100644
index 000000000..d8d738dea
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d20g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d20g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60146064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7c9dc96dcf3e5212bb4550245ce784da66df9db8fec81a2544195aebc3ff7e0b",
+                        "s" : "0x7371f88f9c2496e7b459176cd8c7e9defd0feff5a8801c4acf3d0b5067cefc98",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d210g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d210g0v0Filler.json
new file mode 100644
index 000000000..a688994ff
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d210g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d210g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60d26064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0fb595c9b144977cdec9b17cfb07ce2c8deb738ebb6fda10a19e07fa697dd40c",
+                        "s" : "0x68434d82c72285c7ee9b310f9857163ff1da78d11c0c629c5b5c71f2ff36f22f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d211g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d211g0v0Filler.json
new file mode 100644
index 000000000..3239b21fd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d211g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d211g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60d36064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa7b3ec1a7cdbcb2a4aeaa51d1c5f3ded520d6f5eda7b2248679705fdb9d04f32",
+                        "s" : "0x34a207d7ef219ac523a1c0461f70096118813458143f897ad0619ac32e70c61a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d212g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d212g0v0Filler.json
new file mode 100644
index 000000000..21183e74b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d212g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d212g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60d46064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0bdf9717ec4783dc6b8d677df2bcf19475311d1cf210a469628bca51973251ce",
+                        "s" : "0x4d1faeab05a7ef55abb4d35a1d8ad7d7cf496514f3ed8a9782b49a37d4ee06a8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d213g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d213g0v0Filler.json
new file mode 100644
index 000000000..bc7682aa4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d213g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d213g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60d56064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x348add253252b537c7a9497d3fa295d277ebae1e5570e7fe4ca779403dd9b1c9",
+                        "s" : "0x75a166acd37a7ae49d37a63224df06eba1da755d62daabad0a12274e43ae6fe1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d214g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d214g0v0Filler.json
new file mode 100644
index 000000000..afd2ecafd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d214g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d214g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60d66064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x64800f4834114ab4fc20875e39d79ffabbd4ca6a30b95c8ff75a3a2392415292",
+                        "s" : "0x7a24b719deaf8123f8603102759d2bb55d7283efb9bb9468b9878137313112e1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d215g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d215g0v0Filler.json
new file mode 100644
index 000000000..1ad27119f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d215g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d215g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60d76064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7f7401b4f47700f50e5e74f35d1ec1a7c781e1fbd2397c8823f1f5d5a1009d85",
+                        "s" : "0x13f99c68d702cf784dd6185052e83e3a7a48981bffc81ce8fd452d19bb7aa538",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d216g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d216g0v0Filler.json
new file mode 100644
index 000000000..9b5e10ac9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d216g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d216g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60d86064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd37b31e996deb85cd7cbbe051ef7eeaae42326867b5598739b74412209e698fc",
+                        "s" : "0x4b525f65b4761be9884f763400fea527e70774dc7fc0464ee8eba3d0aab01441",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d217g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d217g0v0Filler.json
new file mode 100644
index 000000000..27d3069d7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d217g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d217g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60d96064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8c312adac914fec0fcdccd3d15867981393baceeb0fa31bf9b73559f8a776200",
+                        "s" : "0x227d2d4f72c4add2a7cea2b82565248d0df617e93d30788b7a5773df3516be43",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d218g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d218g0v0Filler.json
new file mode 100644
index 000000000..fcf8c4478
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d218g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d218g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60da6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcc93075ad217f8a6a7b474abb8ec7e23cc43d3614557f3930636d774e74121e3",
+                        "s" : "0xa493aed4141b25cf901cdcd80c36bc02b090ac1d9c82813ebd3acdb84535f1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d219g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d219g0v0Filler.json
new file mode 100644
index 000000000..bfb75af7c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d219g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d219g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60db6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x75556c3d2f9b837866c8d2e1c2d52c88a7f282f5df05c5ce6ca5b4e78f9dd76b",
+                        "s" : "0x61e523a598f71d3bfd448c44f18c767efcead22037874d89e0b015a45e2e5b8f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d21g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d21g0v0Filler.json
new file mode 100644
index 000000000..93a85f472
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d21g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d21g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60156064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd65731160a8926f72da0c3d8f52e3fc7f40e9748d6ca3224fe13c48f7a42caa6",
+                        "s" : "0x071186a99efb4edcc74ac5e54f73fcf0a35527919b474892bf9ac715e7217534",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d220g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d220g0v0Filler.json
new file mode 100644
index 000000000..b1117892c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d220g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d220g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60dc6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb1ea66ba53a7583a1b98518095508edff09d6d0cea2028a7dab3812b2615d53b",
+                        "s" : "0x0bfc96e8882590608964bd28f1a5871aadaf58c5e8cc69bf3dbc83ebcdf013f2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d221g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d221g0v0Filler.json
new file mode 100644
index 000000000..2a55abbfa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d221g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d221g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60dd6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x64fd7dfbb833a4d67b6aee28966b200c27e1124a0349008ae0dfba3d2f27f377",
+                        "s" : "0x2317dae78344a8c0cfb21c10c5ffec7cdab1e907b848fb40e1dc5bd8d2fc046f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d222g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d222g0v0Filler.json
new file mode 100644
index 000000000..0a1809707
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d222g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d222g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60de6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc82a13d19b85f86b1002fd0386e590aeb9476f579b1433723070d8424905bae2",
+                        "s" : "0x0ea2f18fd40c5ef03210e45e81b9ad5e75b47412e607f827d890f74bb9b91728",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d223g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d223g0v0Filler.json
new file mode 100644
index 000000000..a80f65d0e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d223g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d223g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60df6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9c196799e07609f95965828bec13d45491be330f41ae2bb4f048624942faef23",
+                        "s" : "0x12df91e243185a67917546a0ae0765873b415c6f41b7daafbbc392a6f7f74bc6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d224g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d224g0v0Filler.json
new file mode 100644
index 000000000..82d4d59ae
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d224g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d224g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60e06064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd86000264f2638f91e37bbc0256c717d37d7218dff89183658df2bc2cf79a2e6",
+                        "s" : "0x28cbe4ee1426bd90651cea43d20f3c91beebfb9a213abd7dc04a812d54ddd49c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d225g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d225g0v0Filler.json
new file mode 100644
index 000000000..fca3313f8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d225g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d225g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60e16064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3d5c4886a5ee5656f88e85c4dd77531d8708357f530583c657e130f4b56f0915",
+                        "s" : "0x2cb0259399e89ec2a1d75504b0262d0b061e44b93fa0cea09f4c75ff5d473a25",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d226g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d226g0v0Filler.json
new file mode 100644
index 000000000..58520d556
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d226g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d226g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60e26064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xba4a10e69c0e1fca95b6cf56a58897cbe48006df34cee7bff86e10cd51776fd9",
+                        "s" : "0x4b68739183adb49944b38dbf4aeffffc717c84673efce311fa70eaf83975a64b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d227g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d227g0v0Filler.json
new file mode 100644
index 000000000..df36c1b13
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d227g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d227g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60e36064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbd5333b2e73532960984e6ec8d3e3319572adc4d125c186f09bc01db71f13283",
+                        "s" : "0x769625432a047ff7f8987eba9136ac33ab09ad2938a6bcc1cf16dd82bcdd9872",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d228g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d228g0v0Filler.json
new file mode 100644
index 000000000..d868476fb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d228g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d228g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60e46064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x865dccb9dbeb01c5584fc697551439c1d3963768df0bdb287183847e81bc521d",
+                        "s" : "0x1bab75f5a29edde7565bebb052ba9f5e6a02202ac0f948aea63031d30cc28616",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d229g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d229g0v0Filler.json
new file mode 100644
index 000000000..34c940171
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d229g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d229g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60e56064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x34aa140c9a4d41a0021932f37a10217fa8ca8dab26a1ec4420496ace1aa2045a",
+                        "s" : "0x1f0df6856eedc2e1c34916996a028cbe2b96025afcfab96fd1197aeb895e00e1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d22g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d22g0v0Filler.json
new file mode 100644
index 000000000..89d891437
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d22g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d22g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60166064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf9604a59de6c26da07c62fe0bb9b43125323f91636be6e2fe24b3af957f47e01",
+                        "s" : "0x64d45ddc8deae09c77e2c22c2b106bff6a6c4e3ff3f16e6fd96137bd56388a86",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d230g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d230g0v0Filler.json
new file mode 100644
index 000000000..c1bbd5e55
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d230g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d230g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60e66064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x774158bfb803eac5dc1467d7c0e7b8c5e1d3250194f50bf33546c684c6b33de5",
+                        "s" : "0x394fb9bd338e071f25882ae62d9084414687b8770ef9958f15b44a6e1dbaf851",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d231g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d231g0v0Filler.json
new file mode 100644
index 000000000..b874b3fad
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d231g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d231g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60e76064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3c76c2c5d80ed8566aa051f4e4145581d41bf0361cfc66fde246d4cf173bacd5",
+                        "s" : "0x35b405a88c627eece02cc8ef1cc79b0564fa3db6026fdee94e42dad7f21820c2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d232g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d232g0v0Filler.json
new file mode 100644
index 000000000..31e295960
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d232g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d232g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60e86064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1b5f76f13ab346b7155e1cabf05c0b893dd0ac526d23cb4831764518dc48cbd1",
+                        "s" : "0x723f8f1fb2b5d85a1a48eaf61a57e021afbd4095ea7c31a4310c72e9b7fd391c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d233g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d233g0v0Filler.json
new file mode 100644
index 000000000..f989bb547
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d233g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d233g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60e96064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1fa734e0cd50b6ef3e36e00f0d6298a6ace86bccfaf62f0cca8378ee13be8298",
+                        "s" : "0x0c414f5b6a7f0abe72869f2f13db2f0ca567e2fa2c952df1e728d59afb415038",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d234g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d234g0v0Filler.json
new file mode 100644
index 000000000..d235ea12b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d234g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d234g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ea6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc956758042c11a84402f20388d35810c200d34dbc2e683d9d0772eaf917bdd6c",
+                        "s" : "0x5880ac1e7c19c56e6cc07073ff8c840f7514e0fc095588ce0a575e4bfd8454a4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d235g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d235g0v0Filler.json
new file mode 100644
index 000000000..c917af625
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d235g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d235g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60eb6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb5e7a378b3e7bf128bbf072bee19e34e98b8f2dde3be0a184e471297d28d14e3",
+                        "s" : "0x0b64ba9adfb5cffb15e4de15aaffa50792f05f06a2a41fb1874d673ec81def7b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d236g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d236g0v0Filler.json
new file mode 100644
index 000000000..d39051db7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d236g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d236g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ec6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6663f2e533faab531a9a089eccc3c50322354756b45006868db5ff3467373f6e",
+                        "s" : "0x6d20c6913ca00807c0888b676ba3da5880430e0bc1d2d3ac9d3859fbb58baf9c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d237g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d237g0v0Filler.json
new file mode 100644
index 000000000..aeeeb44a3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d237g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d237g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ed6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9c875e3beb7f9a7eabe3955609f524d7571b71352a855fb974d73ac6588233b3",
+                        "s" : "0x136f33dbfe9f153d9c48dc192259c279c0b050b8773e156c914a1b52dafd9025",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d238g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d238g0v0Filler.json
new file mode 100644
index 000000000..f30c574b6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d238g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d238g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ee6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x235e5d139f80ee928cf64390f13d5ba50df185742b257bcc2973c8f38e0ee871",
+                        "s" : "0x7b07dd55ecae18a2c2c98fc799b1cabfaca598450a86595cf3f7102b8731e9f9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d239g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d239g0v0Filler.json
new file mode 100644
index 000000000..d7a585b85
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d239g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d239g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ef6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3fb174e80babf0676e34ce6fd6fabaa438213f4b8b047095a92b69b5c8fadbde",
+                        "s" : "0x604d13c8a18a8a9008a6d1e92adf1a60ca2c94144f07b3d3f096ab2a1965d62a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d23g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d23g0v0Filler.json
new file mode 100644
index 000000000..073e565c1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d23g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d23g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60176064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5882c4dda3ee9c3ec729b503e25ab42636837481e32b0feb6c1e4082d08095d4",
+                        "s" : "0x66e26e76a9929f554324a1a160b8b33db42148fc499b183cb4a49250ebf39169",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d240g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d240g0v0Filler.json
new file mode 100644
index 000000000..27066aa8a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d240g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d240g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60f06064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf04c630a4656c2951e6677c3f95553ae3029769e45b1cbebff6e1b002169d9ce",
+                        "s" : "0x59750a3aa5eafa4d1ec72cf526f6bb7e1e803599c9ab0165d8b3333caad64dde",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d241g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d241g0v0Filler.json
new file mode 100644
index 000000000..dc6f8f43f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d241g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d241g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60f16064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x905a1cb28ab66c50a068328e8ee0a201511033e41fe0b6b81454a7659378d27f",
+                        "s" : "0x4e2642b5dbfac50f76b7e630c5887942bc1391f4c67f49b9fdba422a738b0d0e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d242g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d242g0v0Filler.json
new file mode 100644
index 000000000..dc3cc34f8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d242g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d242g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60f26064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x59a61003d8694a6595cddae545de8e9ac56e36ad50c6bf13c072493fd5ca3fc5",
+                        "s" : "0x2a3fddab67f65bf83c6d4b9d3c4db409c096855d9af231a84ce9ec7cec25151e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d243g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d243g0v0Filler.json
new file mode 100644
index 000000000..0c769f448
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d243g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d243g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60f36064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeaf9b70a70d30477c8602e43abec87027fcaa90515f23be4e06c0dfe46356049",
+                        "s" : "0x36ade61b81abc0cf9a17014ed6626511f1fd09f15490d637ea75d7cb1097b82d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d244g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d244g0v0Filler.json
new file mode 100644
index 000000000..84fc6e33e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d244g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d244g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60f46064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xecf6f764ec2c238e0430ca60a57b00d33c67949ee71ae0cdf497ec4d848a60f3",
+                        "s" : "0x07ecd50e60783139f88b6f42498a0664b2a1d43fc92e6e50744df3bd1524902a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d245g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d245g0v0Filler.json
new file mode 100644
index 000000000..b405b7490
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d245g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d245g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60f56064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb4bd187da96200579fe00f4c4a07c0a9af009f3df3f4148412869fb52998a80b",
+                        "s" : "0x66600c7e789b353a69636f4f5ff12b23571d609d4ba6961542fb901e83c62c37",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d246g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d246g0v0Filler.json
new file mode 100644
index 000000000..a5999ae44
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d246g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d246g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60f66064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe9fd6ae8f25227ef31fec164543394e2a16e1fef3b5fae3c8633a6d3823c524e",
+                        "s" : "0x415c1986ff4ad12010772059f5c15ff7b72a7a4c8ac74fd6b68d4a7ab1077ea2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d247g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d247g0v0Filler.json
new file mode 100644
index 000000000..b8f13fff8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d247g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d247g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60f76064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9ce1d675795b93871c8c9bd9263aa7196b9cc2113928b5bffb6bca76ccb988fe",
+                        "s" : "0x245426d69ff30e3013394bc4eea9642d6d8feb90efffab233423d0ddde20a888",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d248g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d248g0v0Filler.json
new file mode 100644
index 000000000..37231be13
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d248g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d248g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60f86064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6ab4948670b01b23f5f79220b134f7ec5ba328248cc0e46f76c9907ccef85937",
+                        "s" : "0x3199a9d024d26d90094e77420358d901245b8ae744863bc5fe71b81b96de78e1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d249g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d249g0v0Filler.json
new file mode 100644
index 000000000..573c4ec62
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d249g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d249g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60f96064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0bf1d018d77a6e550889aeb77febd9474ce695e040fbc2a4a86b40a8a332770b",
+                        "s" : "0x49b410a42687990be04f8a9e5ce74e8d93c566884fc9c586f8432f22ade32162",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d24g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d24g0v0Filler.json
new file mode 100644
index 000000000..0d0457ac5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d24g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d24g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60186064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2c9614688ab3f5088dcbfa2de3a8ba0ca6c7e9101bd115b6809b2e39cdde3308",
+                        "s" : "0x7c104f6a710200bc41de29701f757878d09aa46a06b18cf95e51b4a753bdd6ff",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d250g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d250g0v0Filler.json
new file mode 100644
index 000000000..288273875
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d250g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d250g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60fa6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x55356b0ec970bfbaa31e3b53f85f2a2d94d91703860a69404972890a67c1d9ee",
+                        "s" : "0x5c22957c94d7e4e9d21a92c2f3ff8817ffe571d694d049b07dd68d3166b76e4d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d251g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d251g0v0Filler.json
new file mode 100644
index 000000000..91c60647c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d251g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d251g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60fb6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbf58ed3917732c791cb944bee3be3d164aa16dbf38d364882f6e821382d92687",
+                        "s" : "0x30435e4d9c6039d53cb544a357342aa4f142612eb5f3b961dbad419a0d04b85e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d252g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d252g0v0Filler.json
new file mode 100644
index 000000000..01be7de31
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d252g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d252g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60fc6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcaeb9ec1eea4ab5f238efa34e95781855bf888758a4076fb66516760b958cfc7",
+                        "s" : "0x0cce84cc2b6311d9fd36d2063e38d3b1e2f8490925a36012695c17da1945c4a1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d253g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d253g0v0Filler.json
new file mode 100644
index 000000000..411574907
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d253g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d253g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60fd6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6b7a6a3788d78eb69b47ac629aa22770b9a128da16f2daf471af03816aad4196",
+                        "s" : "0x7227eab89ec06fbc227ab53dc1ebd8909c94571528c53e9f29ac97a756bcd0ea",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d254g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d254g0v0Filler.json
new file mode 100644
index 000000000..2ff2aabeb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d254g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d254g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60fe6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdfff518e8b4a5bbdb61eff3cfcc314d2f8a6c5c08fc00f08ecc9de9df0768897",
+                        "s" : "0x0a05099dd8cfb9fc262b835eb074f0b5544af693a9f66bc048c9db8d31816430",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d255g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d255g0v0Filler.json
new file mode 100644
index 000000000..e5464d85b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d255g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d255g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60ff6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xed6bc7a97660f74c044dd4de81448e33e2eea8a0deb0f148e71b22b74b0bf10e",
+                        "s" : "0x73a0f79da4e76bfdc1891a6d0700c7de9217685dd9f4b0e19801b32b3c5ac0be",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d256g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d256g0v0Filler.json
new file mode 100644
index 000000000..1ba5bc809
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d256g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d256g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101006064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3eb741192e87500fffc747bce1be06c27a9631a23a5943be5f9ecb9acbad84ad",
+                        "s" : "0x6a2b4330bcc290be608056542b3e311c2bf9e394b6351bc02d71e9b15daa6f9d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d257g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d257g0v0Filler.json
new file mode 100644
index 000000000..fc5839552
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d257g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d257g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101016064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1e57f323e8c2aad1ea61891b852b0250d21c3b15a1b542fd8c301c74f6977e0e",
+                        "s" : "0x1878ed2bc02abfc1ed05ce2b73f93c9c888e8b704ee3b30f1b67b73639b49444",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d258g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d258g0v0Filler.json
new file mode 100644
index 000000000..4fd100e3a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d258g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d258g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101026064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7e2b8efd2b09114cbe967e9f3734f527cd5c8a270aabeecce257c83f3ed4e562",
+                        "s" : "0x74b5e1cb47cb00be9e731df19983712b4252feef53589c4a15c356db46140584",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d259g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d259g0v0Filler.json
new file mode 100644
index 000000000..8db45b4a4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d259g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d259g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101036064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7f7e2012e5fa4a3f731a5ea39c195b6613565f0a54da0a3eafe9786eb0401be8",
+                        "s" : "0x3560266cd0359e448ea51f3ed20a8405b88b66a385ff6ae64c80589384cbc408",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d25g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d25g0v0Filler.json
new file mode 100644
index 000000000..91a7bb811
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d25g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d25g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60196064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb92cfc9a24202599e6273ba397c9d625fda5812e024b19c2b4763909a90cba47",
+                        "s" : "0x1c9833edd6ad8cd8d8d809b714f4eaec2d84c59662cdd15de62b3b0a70d49b49",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d260g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d260g0v0Filler.json
new file mode 100644
index 000000000..83c34844e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d260g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d260g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101046064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x497e8e2bfd248a591d98892a7ddb2986a44152024fa1cfb55530b55f00646ea7",
+                        "s" : "0x4c31d6d08efecf5962ee1bb8d9e095f53da28d13eadc246ef530537d5a3e6386",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d261g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d261g0v0Filler.json
new file mode 100644
index 000000000..99ae4212c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d261g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d261g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101056064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb77440910857c6915d9a1b79854d4108044e67c5c3774ab84884747ea6122bc4",
+                        "s" : "0x5525f5798be3fefc4be134acb19d788738d672bb906ce537d6c583544194ae9e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d262g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d262g0v0Filler.json
new file mode 100644
index 000000000..4ddc1f4f2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d262g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d262g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101066064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x77e36dd5c4a0bae871ca7d8052a0c8db61a12c5bec3b2c13a680ab12418e011d",
+                        "s" : "0x439367956050ef4b8501e2afa8f76f34f0a78d20a359b77be50b3ea3cdb343e2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d263g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d263g0v0Filler.json
new file mode 100644
index 000000000..37f6d1aa7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d263g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d263g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101076064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb0dac3bea1ca422c1592867637b95ced4a234978bb6df055f9d9baac00a1fdeb",
+                        "s" : "0x40b44c5e87ef551178d11dfa30ccf9fc78a2a0c4cc12095e1a3b3d64c4063515",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d264g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d264g0v0Filler.json
new file mode 100644
index 000000000..419b22f99
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d264g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d264g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101086064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbcf53e922c9418c26dbd2542fde6ee502bd23f3bc120c1dfeedec4c92a0e1a46",
+                        "s" : "0x4687682d7960eee91c162455afdeb787daef45bbf10d4788a9a7d7f723fe0487",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d265g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d265g0v0Filler.json
new file mode 100644
index 000000000..64c8defd1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d265g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d265g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101096064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x827bacd32a8e100b94c365469c2d778bc4727528447d68c2aa29ea30a347ed48",
+                        "s" : "0x504433e6b99f695afe72a2ccbff208624fbd8afb392ba55a48fc22d5c518e85c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d266g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d266g0v0Filler.json
new file mode 100644
index 000000000..704674f2a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d266g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d266g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61010a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5167147e4a5baa2224af3dc8caddde114e623110e52a41d4b86ca64ec9733bd0",
+                        "s" : "0x308e8f32e01822a1e3c48fd71997305623922bf9321a4fc9840a65038d6975c4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d267g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d267g0v0Filler.json
new file mode 100644
index 000000000..24525e41d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d267g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d267g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61010b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x96bc73fd584f3525e0657bbc9b03fd0088ea16bf92c97ac58c1e9720e23ffc1c",
+                        "s" : "0x5d51e5327f3f1faac8547dff90c2a03b8834a8d39e47045d4f6fdd7c1dfd20cd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d268g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d268g0v0Filler.json
new file mode 100644
index 000000000..d0d3c18cb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d268g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d268g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61010c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x32b685e106c4f34b75544db10090dbbdf223d9e2d9dda81738db96beea776b22",
+                        "s" : "0x2342198457b7f082e0c936e32f724c53bb7d981b92c4ccc6a7f56c14ba855405",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d269g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d269g0v0Filler.json
new file mode 100644
index 000000000..73946f2fb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d269g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d269g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61010d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa4b85b8a80ada288a2245bbe4506aa9eda4b9418b36b133807e7a49898d39fc1",
+                        "s" : "0x776814d4ff11d8d7c7b42e8fc9b678c493bd9bce5de601e93c52f0ca0a0e318e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d26g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d26g0v0Filler.json
new file mode 100644
index 000000000..a7e7e1adc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d26g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d26g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x601a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x91db7b53ca4cbfa03d8fbe3f42e8180109713b13fe89ff9d46f874034d92489b",
+                        "s" : "0x3c09129dc7237149ba2bc3fff1da307130d5e3fd8517e21c184870e58050d028",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d270g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d270g0v0Filler.json
new file mode 100644
index 000000000..67b120da9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d270g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d270g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61010e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3bdc9ded64dde03b219aeb255384977ef262bc1ab0fdeb0b65a25556713db1d4",
+                        "s" : "0x4057fed928780ef3dc8367183f1891ca6bcf5bdd2319deb93ec8e959bdb360a2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d271g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d271g0v0Filler.json
new file mode 100644
index 000000000..fb38c55e5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d271g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d271g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61010f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x65b2f9cf3b7327e32ef9337247716622f2587e92830ab63a0af29d2bb80b1447",
+                        "s" : "0x33178c3d8b1150d664bc325ba55a29e93b6166b563bfcda01edf2c98c062006a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d272g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d272g0v0Filler.json
new file mode 100644
index 000000000..77c402cc0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d272g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d272g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101106064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x240a1ab7e40209e8b74f071e2c27197ef4dd6944ff35e243ace0773d99c52a5c",
+                        "s" : "0x4db9fe8a7c005a2f267201e9b9d83edcc9455179ff9a95c5ef8625a753ce7d67",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d273g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d273g0v0Filler.json
new file mode 100644
index 000000000..84c72dd20
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d273g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d273g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101116064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1aba04292df40ba30e513becc4ec506e765b9a89a5b5f8cabc31f87b4e6bc6b4",
+                        "s" : "0x7464dc50f13fed1de1639b5c323ae1f1f7d08a91ed90613eb24a949013e5f0a5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d274g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d274g0v0Filler.json
new file mode 100644
index 000000000..15dfcb073
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d274g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d274g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101126064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb7035f0f268c9178f104752c6c7efc4621bc9dbba72e7c8611b53a77eacf65ee",
+                        "s" : "0x1f9e5bfa40b9ab124d2bb9c40b6a025380bf50c33666935670ab94f54ebc5dc6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d275g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d275g0v0Filler.json
new file mode 100644
index 000000000..82b10e461
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d275g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d275g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101136064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x46868362ecec6a00969230f2743e16d8c76081ff4169ec9d2a9d510af6f8ad14",
+                        "s" : "0x65dbaa17910a6a5dad0a36f73d49d6bba3f1cd6c245fa07c69ed2c7652c00ef5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d276g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d276g0v0Filler.json
new file mode 100644
index 000000000..cbde94a4a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d276g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d276g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101146064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x11de93a1bba113dcc24175c96e42acdee8029472eac0e943291c00ee1c873380",
+                        "s" : "0x1d3385a91b7f9db1a8489f2e643d0b18aa4ae46309c72e4758cefcc93e81465e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d277g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d277g0v0Filler.json
new file mode 100644
index 000000000..bd988f2a4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d277g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d277g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101156064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb5f8d3eb2a1e1f38552bedad161299b87538533ddeb222152b76472693d6b4a7",
+                        "s" : "0x5d6e48b1c1882e6f45d5afa023037b7c0c34b20c55039eea4453603419c2238a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d278g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d278g0v0Filler.json
new file mode 100644
index 000000000..fc308f88b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d278g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d278g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101166064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf693ebb22b2848e2039163fcbe426788236fca20d77715f0cf34efc049e482b2",
+                        "s" : "0x17f9eb137af3847b1a0b82b8c9b4994df63aee81b039190bad9a55ecb35e6b3c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d279g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d279g0v0Filler.json
new file mode 100644
index 000000000..0179eda7c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d279g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d279g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101176064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x65b040bfdbdec949722c94b8abe48fb517d5669d764fb6073154b3421e02e2e2",
+                        "s" : "0x13c7cd232605029c7b074bc49913c67951554c2b7b430726ab8ef3f58d39bf0d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d27g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d27g0v0Filler.json
new file mode 100644
index 000000000..786512704
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d27g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d27g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x601b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe3f4e498adeacb2ef764ead23752cb86ae10fc9aabf02c6cec3758923c555ba9",
+                        "s" : "0x351991ea1f6c771ca006c7074b95bd068e0163ff56af20af788360e6e6cdc2e6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d280g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d280g0v0Filler.json
new file mode 100644
index 000000000..605facc52
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d280g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d280g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101186064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0db16da8a059220963c17b2a7527010bcae2f23e462bad925703aa5c35e70396",
+                        "s" : "0x71ac69baa9bd23b53614512c0e5b9fc09e604f6aa3960707cc2685b774f6a440",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d281g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d281g0v0Filler.json
new file mode 100644
index 000000000..33a467ab0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d281g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d281g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101196064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x23655b7f9b007b1eff98cd0cc13f73feb72e47a0e53cc9d1d1146d01dca1c511",
+                        "s" : "0x6b2123527203f79879444f3571544e2ecc4ab1dd97ff23dfdd69688fa37778bc",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d282g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d282g0v0Filler.json
new file mode 100644
index 000000000..7c8bd331e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d282g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d282g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61011a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x059565afad7084c53c8bb2cf8edcaffe9319a60f03e0d71fef90318b50bc789b",
+                        "s" : "0x6d3e8398b972b918c6c2ee7ff8e0480084d89d30f71ca3da5e88fd12f259587e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d283g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d283g0v0Filler.json
new file mode 100644
index 000000000..ab4498f30
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d283g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d283g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61011b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeb3b1b56b80d7de2b9382515aba5b0554059c7e52173e689340a3423662a928f",
+                        "s" : "0x4f1b109f9a872a3084365386780c68f018c978175ee8fbce8c26635e794cfd0a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d284g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d284g0v0Filler.json
new file mode 100644
index 000000000..b4bf082d6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d284g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d284g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61011c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4e0e191b9ed158a0f7e11d91de5a406b6df7694e8d7516b1489171da5a1af52c",
+                        "s" : "0x2849f38abb95951151f5be997a20a5c81a785364e04894f6388665ec64f3c4d3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d285g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d285g0v0Filler.json
new file mode 100644
index 000000000..14c8e2ec6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d285g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d285g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61011d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x227f18fe1e16778a400251a36653ab3a63db4104f4e1a49cdf5f6a0b1a44f6f1",
+                        "s" : "0x0d08e8869a492dce0573248d1cb78de12442e5ef5f84769df33fe6a21a617a71",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d286g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d286g0v0Filler.json
new file mode 100644
index 000000000..a591b0615
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d286g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d286g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61011e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x880d8d2259fba8ad1606f8598f2e36e5da69d50ba0ebdbe2482ed9d0e4561497",
+                        "s" : "0x19e9b3a7d2a82d31d8e6bd31c52d550a588c54d1daeeb24b23fb2432bba8522c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d287g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d287g0v0Filler.json
new file mode 100644
index 000000000..b6657ed41
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d287g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d287g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61011f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xac96dec7b28ecf017c61e3dcc80c62f83f0ce798c5debce49abc1130c1fd4538",
+                        "s" : "0x7e342588ac03053dd3408e018774a7f0d5aedf497566e42b83c2032fd2667ac5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d288g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d288g0v0Filler.json
new file mode 100644
index 000000000..7b0ba4ca3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d288g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d288g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101206064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5684515f6a2af56ec16029d975896790d69e1c9789bddf6ab8fab2c3e11cb4fd",
+                        "s" : "0x1f2857ead5f59a47426aacd354e317982f4d847475c7832b8b70596b61146b2e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d289g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d289g0v0Filler.json
new file mode 100644
index 000000000..3627499bd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d289g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d289g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101216064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x350cd77c06b1b3c577852c5eacaea6effa11bf66ce7195aca9f5c3ce3a3891cb",
+                        "s" : "0x76f2f671f4817ad937b86e2cc25c0267ca9c7a49b6a326d8eb7c305a2168e1b9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d28g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d28g0v0Filler.json
new file mode 100644
index 000000000..2e4241bea
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d28g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d28g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x601c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfcd5526678e03a71caad8e65580ee7d3a748640580f4b7d9c4448aa548b08a21",
+                        "s" : "0x326cdb1fd9fc27f497c57bf145db419f2898ef841ba8f393c79bb7fcf17d72f6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d290g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d290g0v0Filler.json
new file mode 100644
index 000000000..731e86b1f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d290g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d290g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101226064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9812d960badf55db450b369d5ffd0ca9cb804ee07893bb5788a65ef7753bd066",
+                        "s" : "0x612a2057980a15980729b885238eee330ee96534e31ecaedfe1407f46ea13fa3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d291g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d291g0v0Filler.json
new file mode 100644
index 000000000..86fe3c951
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d291g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d291g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101236064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x035a9cdc89807d2256b5d7ead565d32df50d71a98b602272afc1e2954f20d4cd",
+                        "s" : "0x1e6f4c7e19bb64d9cdff13db3199a781eaa33d044fe2f253a7811f3f94efd37d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d292g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d292g0v0Filler.json
new file mode 100644
index 000000000..9564d32e8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d292g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d292g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101246064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbbd83c38e08a96671c98ab86198ac4f8d7ea025a9be2d06ec17e523a799082c0",
+                        "s" : "0x58e077952ec16308cae286a3db2b31b2b93c76215755adca3bab26438dc8e2be",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d293g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d293g0v0Filler.json
new file mode 100644
index 000000000..ff06419ca
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d293g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d293g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101256064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x34a7670918a715fc4592b0e689fa6819d7c7f494fb7d29516c69825a50c8a383",
+                        "s" : "0x1c02c2b72642e8512b5eeda8d8de20b2ff8275f4c026b286f21993dc92a1bc33",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d294g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d294g0v0Filler.json
new file mode 100644
index 000000000..4570a5462
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d294g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d294g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101266064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa51844069102f0aa87b4f8c659f7342db990aec6e1c82c307a45bbdf034889ae",
+                        "s" : "0x265a41a7c3cd289575ca1b4a4bf27dbb524f4a4d88ba37ec537baffbd4797931",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d295g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d295g0v0Filler.json
new file mode 100644
index 000000000..714ba3920
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d295g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d295g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101276064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x90e21073998a5547a7da1058913319a21111cded4e5f54018d247c5e7aa8ebdf",
+                        "s" : "0x11f78399755224cf516e51e1f351eb3317fce63018a577e7b0e539bcc65bbed9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d296g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d296g0v0Filler.json
new file mode 100644
index 000000000..4a2033fcf
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d296g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d296g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101286064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe3955f72dfa036f7a6e829dbf2f3493dcb1a97cbadc1d2b22e22dcd34732898a",
+                        "s" : "0x585687c89fb46bbb0cfaafd72d7f3e355edb78e80579498b2e471b91b65d2c45",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d297g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d297g0v0Filler.json
new file mode 100644
index 000000000..f4d4c479c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d297g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d297g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101296064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0a4a74f79a301eccb1fccb7d78712279875a0f45724373541c3a98f9d9c2d0fc",
+                        "s" : "0x3d33836bb491617f5fe2f5ae05c333fb171d3fcb46c9d778a1e2bf6d0fea8162",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d298g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d298g0v0Filler.json
new file mode 100644
index 000000000..9c19378d0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d298g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d298g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61012a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8944dcfab3ff3d28de741f074ebfd789244370581165b2eda138f0aaed2dba58",
+                        "s" : "0x49f46d39c202072284efe77f733eddb0fb02dddd47ff2af99d25361e49e6f208",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d299g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d299g0v0Filler.json
new file mode 100644
index 000000000..9de341fd0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d299g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d299g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61012b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9812c5452234f80bc607248504c1d165a980b83a5d2ec246e2494dc9acefea08",
+                        "s" : "0x7c78f83924d51125d3a9f8852096652a8fbf862d3ef93dc2373f44113a1cd22c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d29g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d29g0v0Filler.json
new file mode 100644
index 000000000..94e6ea4eb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d29g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d29g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x601d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf2a928034a3743d6860f6714e7bdeb7789488469f001f355466300dd1241d21c",
+                        "s" : "0x2e067efdf37139dd005c03d39fe5ad293857f3001fd9b8194c5a509caf274398",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d2g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d2g0v0Filler.json
new file mode 100644
index 000000000..b495f9e37
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d2g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d2g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60026064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdc0cbaea7a90cd54443e6a1365ed0c24cb52d5000e988bc1870d2bc3e6e85ef2",
+                        "s" : "0x0cc3ce1e127ba1cb06c26e394cb7ace1089ee9ef5ff97fd9262da1dca4da2ce7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d300g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d300g0v0Filler.json
new file mode 100644
index 000000000..4b7363325
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d300g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d300g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61012c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe095bffa394b67a36dc4f996c21c4a14a2b921ebae31542c01a04b705b7fe4fc",
+                        "s" : "0x27e666b61efff582e4c7bebceac760f8a5373dbd698432d9f401d1e8c1b76259",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d301g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d301g0v0Filler.json
new file mode 100644
index 000000000..8e29e301c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d301g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d301g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61012d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0f06965b53fbcc7338d8926a2b0f582dd1d37969ccc9ccca74a5f89bec54fecf",
+                        "s" : "0x6cde21bc5d932f9d7bb20e4abb6a82ee8e081cb22cec6ec7f5394c039aa9389b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d302g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d302g0v0Filler.json
new file mode 100644
index 000000000..d2fd72fe2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d302g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d302g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61012e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x260af15aee90608fee59aaabf74c543a522fc148cfc2ea6cb7f98f58b066d98a",
+                        "s" : "0x0d6e81d76405c469dfad581593586cbe9b5dec66f2c5076bae1973af571ae21d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d303g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d303g0v0Filler.json
new file mode 100644
index 000000000..2719ac486
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d303g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d303g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61012f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa498b19487980ad3a6e4ff0f23f43d328ac6a92cafb2eca5f4b6bc725c7782a8",
+                        "s" : "0x1334cdba12ffeea46cf7f5fcf36f2b9a7f95f7e3a06b7a621781bb26f53d7b96",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d304g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d304g0v0Filler.json
new file mode 100644
index 000000000..f45838506
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d304g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d304g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101306064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x01c4d4c153ad5e94bd88e75d7d63302b0933673c26d3e9f34459d2fe8701c378",
+                        "s" : "0x7b02c04766d7df49143f4e9d92e3adca5044524f0962309417bb53fa8429ab3e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d305g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d305g0v0Filler.json
new file mode 100644
index 000000000..a19eea0f4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d305g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d305g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101316064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfd080175616bffc57b7baf4e5487c079ddb7cc10df28483eb281507164db8e6f",
+                        "s" : "0x718ef8e513e8019fe75a0813615849de915cd6c497df0ffe20bb91267a325977",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d306g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d306g0v0Filler.json
new file mode 100644
index 000000000..92307ef5c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d306g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d306g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101326064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x93d7723183592178140c4d2a74879891671c3347eafe5e017c74a7ae532e6325",
+                        "s" : "0x5679a307a3b769f93c141c5c7d119a5561ef9966fc1f0baf8f1acec063d81dae",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d307g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d307g0v0Filler.json
new file mode 100644
index 000000000..c5a5ec01a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d307g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d307g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101336064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9bd7519f65119ea77715c6c055c1fe07d61174d39639d0abb7334992853b0a4b",
+                        "s" : "0x3503ec340bea56782dd655a30820c76b93c6c47fe72424d82547b33a5d3fc30e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d308g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d308g0v0Filler.json
new file mode 100644
index 000000000..654f37ec9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d308g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d308g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101346064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0ee5ddda63d9f01616553a936ee98fb5b90cfb62a99b833e69626e9038b33c75",
+                        "s" : "0x6232faa15c790edbea69708afb96612a59e057318e4bd00fb62c09ac2d7d98ab",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d309g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d309g0v0Filler.json
new file mode 100644
index 000000000..d0366a9bb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d309g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d309g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101356064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6f346a20b0fe1eef7fd307eb6e274b431f23e9ee1380951cae0d4a7888436052",
+                        "s" : "0x133c7305e98563ec3cfc9fec386d26c8cd22a1e10bf43accce1984194b35cc0c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d30g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d30g0v0Filler.json
new file mode 100644
index 000000000..21d1bbc1c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d30g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d30g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x601e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5bf12e4870bd942ac008ebf329235461864d6bf7460db5c79a19917d23027dc4",
+                        "s" : "0x2c4513e830c46d83c9b57c2a195f1d81f58a8aaff22eda8a2e3bb20b38d03713",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d310g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d310g0v0Filler.json
new file mode 100644
index 000000000..407af9bf9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d310g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d310g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101366064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x77b474ec8d8a8f9e2ab44a8be926ec04027d19f030f77a9849427f00e2bbeaa0",
+                        "s" : "0x7c17be793768cb38238fb176f12fbafe7ff45baa5e732d3a21bcea43a65edb0b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d311g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d311g0v0Filler.json
new file mode 100644
index 000000000..3c5c1ba3f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d311g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d311g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101376064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0efc344b5ed129a9f620fd7d50093909d80522d89fefa11cb516be63a3cad0e0",
+                        "s" : "0x0fba4100891a656b19ce098ea7538d075165069e823ffe68e0fe2196ae830a3a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d312g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d312g0v0Filler.json
new file mode 100644
index 000000000..8efb7f830
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d312g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d312g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101386064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x01351dba334da0f0c32d29325444403a690f515dc01e7a35f6e4455029491f4c",
+                        "s" : "0x35d5730d9bdbe41fd103e57d4aae1e9d5465a7fbe08373bde2807def603a2e68",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d313g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d313g0v0Filler.json
new file mode 100644
index 000000000..dbe6ba36a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d313g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d313g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101396064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4e60ad00df6228139e296fcb19a792a300b36425155d31ead639f715ec3e3908",
+                        "s" : "0x61eb00d9349ae64d224f1116abbe9b696c3d606add152436e526aad953172417",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d314g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d314g0v0Filler.json
new file mode 100644
index 000000000..60f99925d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d314g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d314g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61013a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbdf2e0c65d33c9ac9592039947e5fd4b8a2a8e52946c5709c449658ba7a99eba",
+                        "s" : "0x40b5d08d0622082a3967cc021df230b1ebae6e7db38e91a40ed478d01fe07114",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d315g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d315g0v0Filler.json
new file mode 100644
index 000000000..e4c99c6d4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d315g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d315g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61013b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x013a73b3417b3585f11951606f2eb43558cbef13989d3aadcf952720135ebfa3",
+                        "s" : "0x2672586a3eec6879c48d34f00b67ccf1b9f84d001fb01651be1407350e3895d2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d316g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d316g0v0Filler.json
new file mode 100644
index 000000000..ea3b352a4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d316g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d316g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61013c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3ad9fca6b598b4b2c15319da7fff621685544174501d9ede9336c3328c9d8fb2",
+                        "s" : "0x0506470583ae359b0535bbee0d1e0819b33af8d42292fa837023c941fe0bc421",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d317g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d317g0v0Filler.json
new file mode 100644
index 000000000..3a7baf91a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d317g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d317g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61013d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbd4227ef3b549961e0e469e54df22d73cb4565f03ecd0d1eb6ce35edfe4eae07",
+                        "s" : "0x65cf5bb029ca5bfe8ba210f387e022d0b46ddea635df2cb7d1e549e6592a92ab",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d318g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d318g0v0Filler.json
new file mode 100644
index 000000000..34ccba8cd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d318g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d318g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61013e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf814c447a61877d80908dcf55d45def777f554b3567cd355f6bdd3f9ce2ee110",
+                        "s" : "0x24a59d8b289af9ca9bbf79be142c29cee0cdf299c90f380d440f32f9845686b7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d319g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d319g0v0Filler.json
new file mode 100644
index 000000000..ff57f0f6c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d319g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d319g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61013f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x02c27031b2dfc24f114b3db15d9d71705c4df2e1d86d6da80b0c0fb9fe5de48f",
+                        "s" : "0x7fdac4dd642dcf8fa0cd259b9e27ae7f35524dfd58819edc345ae16286d185ba",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d31g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d31g0v0Filler.json
new file mode 100644
index 000000000..601c05411
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d31g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d31g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x601f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6e66518db54bb5d307573975c4e8d933b134ebf0b2539bb8309843ebc8a21d76",
+                        "s" : "0x2b8b835dc372efa8cc016dd97fa71a6d145e12c9cee9477d157ddd049388d488",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d320g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d320g0v0Filler.json
new file mode 100644
index 000000000..0b5517176
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d320g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d320g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101406064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xac1646eace30984fb4d0e97ed102df3412dfba93ceffd379fa8a155a06ab526f",
+                        "s" : "0x559c09d01b22795349c65caccc2bec036fab86130c4a61444b70ffa327768612",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d321g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d321g0v0Filler.json
new file mode 100644
index 000000000..cae9599cd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d321g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d321g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101416064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa639d0df7806aa12899f3273b573189a54520d5597e970ca21124d3e50aa62e9",
+                        "s" : "0x75275aa7094fc1d3fefb13658713652fa83e16366c7ef936a0dd7f57e5751c73",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d322g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d322g0v0Filler.json
new file mode 100644
index 000000000..c91b89e9e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d322g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d322g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101426064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3eb34f7276ff3d2c88daf73c777d9a85878c741ec3ddcd2f2088f8cb220b5340",
+                        "s" : "0x7f56aab36f8c5c5bbbe4765c672e79b39b2b813f2ffc581142b6b6e4469d77a8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d323g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d323g0v0Filler.json
new file mode 100644
index 000000000..b1baac47f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d323g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d323g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101436064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe42557e84b0ff1d70d7f52ebee4c247252e661442d352c4aec36ba9ca0354256",
+                        "s" : "0x669e1977576b72dd256b5168cc95d2f1111dfc6cb3ff10dbbce52195ed3bc213",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d324g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d324g0v0Filler.json
new file mode 100644
index 000000000..2c49cf04e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d324g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d324g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101446064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x43fbeccd09143a6f3abd3d4902f7ad8eaa886b858a668b9cc7abef08e561cd9f",
+                        "s" : "0x1e10ec7eb67a5991154c8d90e836385eb9c6a7f289907a706d296e1e985134ed",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d325g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d325g0v0Filler.json
new file mode 100644
index 000000000..c12d74f78
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d325g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d325g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101456064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8b1c60985950c9e02fff94e98e7cd17b2b35dedec67369a01b072f7f5adb088a",
+                        "s" : "0x4134d0c74428e03f4d6b68f28f33e3fe92cdc2404a455f958f41c7a53401299f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d326g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d326g0v0Filler.json
new file mode 100644
index 000000000..4c97f82f0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d326g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d326g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101466064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbec3aa5ccea2e13b1b325c168878a1afd5f2aaf420fb814488e9091aa7e561be",
+                        "s" : "0x1cdeb56c93a26094977549b5ad273150cde290f4de65fa7ded51481048bcba9d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d327g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d327g0v0Filler.json
new file mode 100644
index 000000000..bebed2566
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d327g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d327g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101476064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe8e70f5900008352371828ac772d1d7884075c76c1065d9f1fda9c0d3a58d3e0",
+                        "s" : "0x6969ce351194066970df88d3bcf51b4ccb1352ff4b4203716766ab8c50f35df3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d328g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d328g0v0Filler.json
new file mode 100644
index 000000000..ee5af89bd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d328g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d328g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101486064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcdf4f5dea115afde238c937f746bc205de34625e6cce36489101fb0a729a5ed5",
+                        "s" : "0x3803d41f72c949d8896f600162ec79dc6ead9a5cbc257b45070f644e72da79b9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d329g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d329g0v0Filler.json
new file mode 100644
index 000000000..a3f3ea4d7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d329g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d329g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101496064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9605759df78357058d37746c6f4305d8f6716dd3df13dc1d0b0be72a87792d94",
+                        "s" : "0x5ef43599b9c4b7b402131fa33ca959ced3c855dda3c4335c5fa400d193d25202",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d32g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d32g0v0Filler.json
new file mode 100644
index 000000000..c3ee267a4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d32g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d32g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60206064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x05cdf70864968a38b8b3c940dc15f983e28bd420819ec2eb1f45f58218b035b0",
+                        "s" : "0x03692067b32de1e3e10e169e7b4448493a26642873f07522bcc7b5725120e114",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d330g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d330g0v0Filler.json
new file mode 100644
index 000000000..5da5446b7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d330g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d330g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61014a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x545322228cefa5d0ca6fd29f38f88ff6bb6ce139f5453ac8f376623d89ae5026",
+                        "s" : "0x41ea144a8b41a5b061c96fbacc091d5d461a301111975b7ca20c7a24d4b3c6c3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d331g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d331g0v0Filler.json
new file mode 100644
index 000000000..17b131d55
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d331g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d331g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61014b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xad990484536bfc2be5e1d5a70858082ccf58a6a2b4febf7e903efba1b2d3bab3",
+                        "s" : "0x5b0c05d7f33acf9d03978bc4b68b6cd286103f503cc7bdd5e16343cb068cd1cb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d332g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d332g0v0Filler.json
new file mode 100644
index 000000000..5c4617e4d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d332g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d332g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61014c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82e6ce65cff3d4b7715b437d629389e6c474ba4a5f168e1647f8558f442c7672",
+                        "s" : "0x5fa4e336669a76738aecb21d8b95bd9549286dd8e4002e492c65e31c90836c82",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d333g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d333g0v0Filler.json
new file mode 100644
index 000000000..026e30cf1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d333g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d333g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61014d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4888fda778a5c62fdfab367b9ab57a58ee99f84192ced86c203261682605ecff",
+                        "s" : "0x569aba202eed7f23ffb1f00a5db029f92c6ab4f3c2921d606f78a54270e0568f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d334g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d334g0v0Filler.json
new file mode 100644
index 000000000..43f12e7e7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d334g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d334g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61014e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4aaa84a975fcf0880534e4062d0f59da0cdf15de05b206aacdde4e156ad2a8e5",
+                        "s" : "0x389af8738c587ae0a30f832003d9236659536bf343a72bb79b4647c18b47c0da",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d335g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d335g0v0Filler.json
new file mode 100644
index 000000000..3ccd9cd3f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d335g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d335g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61014f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4a3e673c5bc98a88bda1e2f8a4703b7d6190d4a99df63910caf9e058a8ca4105",
+                        "s" : "0x275e1b8bccdba6feef8945e7f7acf912259e87e58fbfcb4f421396414d2ecb6b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d336g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d336g0v0Filler.json
new file mode 100644
index 000000000..df6f12c08
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d336g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d336g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101506064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3e8d5e127e5f6ab6b3d3e6d44fb9ca910d156d0679af778aed3947d8deceb491",
+                        "s" : "0x0f8c0c7546303fa10b620d9fcccea7d6b479e1662b9221ae3415923b721d2daf",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d337g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d337g0v0Filler.json
new file mode 100644
index 000000000..4f65d5eb9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d337g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d337g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101516064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf2501e2fd48402d0be7fe79777002e4af3ce85e62e3b1ca9748daf0117791814",
+                        "s" : "0x278c1e24dc77d699af1c457858f6fed1770871b57c720f1d7be56ad0cf791f5a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d338g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d338g0v0Filler.json
new file mode 100644
index 000000000..fe7bab3d6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d338g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d338g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101526064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfb268e8a11e4631f1ae0d0de268c4595552f6c42be8426d213ec25288547f010",
+                        "s" : "0x04792561d21310f6a40448658ac30d0c89df169d23567c8fd85f9a72ec61f169",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d339g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d339g0v0Filler.json
new file mode 100644
index 000000000..6936aba0f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d339g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d339g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101536064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x62286b545664ed4a9c4e1078ccc048bb349b7717df054e9a342df6e78044e788",
+                        "s" : "0x58e8054fcd14fe282bcf4209b4e9027c11201c4236503eb995908348f6a05ffd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d33g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d33g0v0Filler.json
new file mode 100644
index 000000000..9076de742
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d33g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d33g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60216064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2690f8faa1d04e6ad780720e8fd2845b1e4ef2978160bc588191fa938e1b83c0",
+                        "s" : "0x302034f5a1b6cd8df1f67feba28ce0f57019b0954000bd04fbb42019b8fc48fa",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d340g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d340g0v0Filler.json
new file mode 100644
index 000000000..eb7a39994
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d340g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d340g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101546064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x668b4e32709c48e72c6f8f333d53f24668aa117ad220f46abbc901d3098539f1",
+                        "s" : "0x28a8ce4665a311f7de707e01d043e3b72871dfe9b11e7b4c7e9a578c5b6ea9be",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d341g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d341g0v0Filler.json
new file mode 100644
index 000000000..4a69fad4e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d341g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d341g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101556064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7a06359d6d948916da980521b0a46fa8278e5b2c3275e68eeeea1dc1b521cfa4",
+                        "s" : "0x5cdd664ca6b9a1d4f82304341c28ed15e2a5e9f50799bd2c8a3b05f07b9687cd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d342g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d342g0v0Filler.json
new file mode 100644
index 000000000..4dfaaf379
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d342g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d342g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101566064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcb40e71edd0cd3322abde2c6b53fcf5e5eee0e6cf7574251e26dccdcb97ceed2",
+                        "s" : "0x2345d5f47d398cf4552f25c7e3b76beac45043394cc3fefc34ceeb2311724f6f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d343g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d343g0v0Filler.json
new file mode 100644
index 000000000..8619c37c0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d343g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d343g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101576064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x11731c7c12f0bd98d68d371eb0885c51fc64d5627422655adf840a82a6aab362",
+                        "s" : "0x328d84898d4d95a9832367bb513c1ac56dae4f0b74be226fb7f562ab760131c5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d344g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d344g0v0Filler.json
new file mode 100644
index 000000000..57ab79d8d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d344g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d344g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101586064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x667cfecccb25afeafb90f335d886c9cf64261b005345800b61993ddcfb46ecb1",
+                        "s" : "0x67bf6ba8bc201a3f6e5f1b7b7e87634c7cda82a900b08b44bd782e106ee2ab77",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d345g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d345g0v0Filler.json
new file mode 100644
index 000000000..7ecea2c80
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d345g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d345g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101596064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5035ea5abed6e68a68ca4ee06150566c529be48a37bddaf8147d1898581e9fa1",
+                        "s" : "0x74110454bbbd1c8b4e25902798912f01701dcd69c7d7a234182d5ee8276347a8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d346g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d346g0v0Filler.json
new file mode 100644
index 000000000..f6e334589
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d346g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d346g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61015a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x305b238ad5fde759964d2be7fdaad065953c3c40886adfa8ef15fae09322304b",
+                        "s" : "0x394e345c74ad968bf522c63c57f8b4ddf57b307710706a04ea83cc6722945c19",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d347g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d347g0v0Filler.json
new file mode 100644
index 000000000..da420d09e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d347g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d347g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61015b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd442c1d181836fe0dd2807a01c07047b2f86d98ffe3a3b42ff38b628915dff1c",
+                        "s" : "0x3afe181ad69e65d347f873f78ddc0bd53c472aea16691d94a63de2b8afc3df95",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d348g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d348g0v0Filler.json
new file mode 100644
index 000000000..a5c0b047e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d348g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d348g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61015c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d2effd541dfec964f15628aa5bd299c2c9527b8cf637c53cbe79b0685fbd205",
+                        "s" : "0x69a54a094922eb559e079a9256a601d5a533746b18ee08cdd483c726a1ac8d39",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d349g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d349g0v0Filler.json
new file mode 100644
index 000000000..5d6dfe2aa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d349g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d349g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61015d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x509f764014d77d9949bfca3690c6fd48b3ef26353033edb47ada15e2bf115958",
+                        "s" : "0x1d6a56da03329298895ef363debbbad1886a7d9fa64af5f315cf87aa8a319496",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d34g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d34g0v0Filler.json
new file mode 100644
index 000000000..07329d6f8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d34g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d34g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60226064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc83839f5d5aceb4339d30e58304bd622468963a5c921c1496267232d6a1f016",
+                        "s" : "0x37da94f0511a8baef7332ce3db22ed8c14d8da7a70761c8444aeb0b142e78329",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d350g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d350g0v0Filler.json
new file mode 100644
index 000000000..e28745576
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d350g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d350g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61015e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x816a7b4f2eba6438c5017b4067a4bf861fd2eb39a453b313e6c3c81b2300ae66",
+                        "s" : "0x368a4d15cd14bc7c7be0596f3b14296653dc2d2572101d3cf6e5b215b38706c1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d351g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d351g0v0Filler.json
new file mode 100644
index 000000000..5205b821f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d351g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d351g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61015f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7e2b2b1184d268dc057fbd1cf4ded94f5b93d3fb811694fa9d66c583b0713c19",
+                        "s" : "0x076f8caa7d9a63a5b4c6b17b7076fa251f0dfc7303586103588164cb0e3a29ae",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d352g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d352g0v0Filler.json
new file mode 100644
index 000000000..3367d314b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d352g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d352g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101606064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xda165d6cc6180926dac6128a93d03fb6d3ce8b6a33373fdc7c7dce1022ff952f",
+                        "s" : "0x5ea8e0fb207c32f940e1ffc0c7ff42c6920987ba16559fba84febf4905eb4913",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d353g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d353g0v0Filler.json
new file mode 100644
index 000000000..1eb4358f5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d353g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d353g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101616064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xed8f844b185b6ee8f1686e214a2d7ed11f96c5c1957ba00a690908f398755a4a",
+                        "s" : "0x2527836587ffaf0631531a705a481bf24a0e1fba2b94d1cab7afd0d0be0b952d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d354g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d354g0v0Filler.json
new file mode 100644
index 000000000..eb0d6783c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d354g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d354g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101626064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbd7686db8eb4c1e3770c127fb13adb89f6a5db6281badec0e7f44c88d1fc7c60",
+                        "s" : "0x69ca3e566af051640f24b7c19636f055b266cacddfe9617570af4d3c1f68a7ef",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d355g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d355g0v0Filler.json
new file mode 100644
index 000000000..82a338f37
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d355g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d355g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101636064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6a9df4313e92d7156cf07da1490395dcd88d20f844ed69185f73ba9bd7f8520c",
+                        "s" : "0x739b1b75a0d689fdd98dec19707f42e797fd59d56b972650bb4fb53816f4eca4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d356g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d356g0v0Filler.json
new file mode 100644
index 000000000..8edfe41d2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d356g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d356g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101646064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf5f0609434be813ddd6f6692916110371bdbd419bb9252546bf9be59c0ca808e",
+                        "s" : "0x2304e3fe6510c449e7e5d097f95ecfe9f08c7c435900deb6da0bbf22ecab280c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d357g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d357g0v0Filler.json
new file mode 100644
index 000000000..8f54097b8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d357g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d357g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101656064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x24587e67d370642a15313bcafecfeb73a840dcb7b750cceb42d64ab4f225c698",
+                        "s" : "0x4b15a0700637650468e24d66f786ad32d0f74745ce481ee37aa077799eb3e63f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d358g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d358g0v0Filler.json
new file mode 100644
index 000000000..f6910842c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d358g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d358g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101666064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0301e3a277bf0920a9a71033eb362124aa6d69cc1df6fd20f143efd27af9cae5",
+                        "s" : "0x4ecc3d8742bc4a8b483cb96755036d2e96312543bb7ca95f4d17d0fa2e6dda3b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d359g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d359g0v0Filler.json
new file mode 100644
index 000000000..a29b4024c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d359g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d359g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101676064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x085509fbb1aeef4758a694ddbe1323d18383711a1588c101fc4d14ad56e60f8f",
+                        "s" : "0x6c2eb87397cd7b9cbfe1ab37adae28715bb80149fc8a521f124ea72fab689fdd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d35g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d35g0v0Filler.json
new file mode 100644
index 000000000..39a676f20
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d35g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d35g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60236064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6109b54575d5cfb1bab62b08e14a35ff0c1b6a7a85539c8dd3e3a204f3d6aaf2",
+                        "s" : "0x76d3be17dc06ceef24b4637217fca52dac45be590aee7a7d77ba3cbb3e65f243",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d360g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d360g0v0Filler.json
new file mode 100644
index 000000000..f539ed58f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d360g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d360g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101686064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc3052f5a221ed9263d8431b808386fd95bc8fe898494d0d47517790e093bbdbe",
+                        "s" : "0x11b25adaf566266b3978e1cd01cba4d7b27731895bb3d060a55d4ca40ef9ea27",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d361g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d361g0v0Filler.json
new file mode 100644
index 000000000..b01ab298d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d361g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d361g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101696064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6361ce83f73f5d9c03401edbca849d65bad0266af27d8511f95152d4e6da2fa4",
+                        "s" : "0x60a17d4337325b069f14a16dc48bf37e45a14d4040916b2bd966cebad15de59d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d362g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d362g0v0Filler.json
new file mode 100644
index 000000000..f6285480b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d362g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d362g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61016a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x42d31b08eab942e6ef0440492be54ec571f6974536a932241234187fcd0f5730",
+                        "s" : "0x38f87afa20f8bafb11591ab21a153b6a20ed92169e88d6734d7ac7ee5699211a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d363g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d363g0v0Filler.json
new file mode 100644
index 000000000..c3ab6097f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d363g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d363g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61016b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6e9fc96282a9de564a0d942adc1e1c580ac4f6e42f5b38c6cbe1519f2f5a49f9",
+                        "s" : "0x68ed0616dc3267b3d06ade7c274268ef75b735f82c34062e6418bc9d8d48177e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d364g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d364g0v0Filler.json
new file mode 100644
index 000000000..7e86d2d05
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d364g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d364g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61016c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6123e7a86343bbbba6457806be51b2e03052bb07eb8066b7bc8973ba8aaed53b",
+                        "s" : "0x5233232f724fe2f478235951f2988623c055af6ce481ff8b863cece15fea61e6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d365g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d365g0v0Filler.json
new file mode 100644
index 000000000..a5f9a79f3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d365g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d365g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61016d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x46c78e6328d74f40618ad8a149ce85d682f0b20f1864de6813d0be2a0fd0fef7",
+                        "s" : "0x113d03d5f67df72f4ef8b6fe33fc48b482ae4ac1ea1e8f8331e186c44383e095",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d366g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d366g0v0Filler.json
new file mode 100644
index 000000000..3fced602c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d366g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d366g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61016e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6ac47fcd32b1dab5b45c5d09694b0a4b7fadedad4d8ad5d4867527f7892ddf22",
+                        "s" : "0x26f8c6cf2463f09fa551b13818b41ab7a3fb1a7c8b16f1bc5f97c0fc66745b91",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d367g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d367g0v0Filler.json
new file mode 100644
index 000000000..cc3a5aff3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d367g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d367g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61016f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5c64e672e7fd63be18e73a38f3c619bb03741fd5617cc5e2c8182c1de5109d8c",
+                        "s" : "0x71532255dea3921c834cc6a9288a758ad0281fbd9d9b676933de8117f7680809",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d368g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d368g0v0Filler.json
new file mode 100644
index 000000000..de3b92ca1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d368g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d368g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101706064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2ce04464ad08d8be19f2c63f48874af35f151a261e577d258879343d9360cba2",
+                        "s" : "0x1002bb277d50de3045538c9e69c923b9af664b94a4ec418e834b72810cf0911b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d369g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d369g0v0Filler.json
new file mode 100644
index 000000000..b070ad946
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d369g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d369g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101716064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xde5b2a57c57a46b5b3a7f8490bb99df61dbaacfa7402889264bd8ae8a965b5e1",
+                        "s" : "0x20a82657cca49cd6a141c10ab1f0ba129a4903865e1b7783d45abebfbc4a3cff",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d36g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d36g0v0Filler.json
new file mode 100644
index 000000000..703877e4a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d36g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d36g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60246064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3fd5300151658fb69dc8ab11b3f28e17913c845e449f8c868c33f91a91f92351",
+                        "s" : "0x35e1aa7c0f204e276c5158281ba281d4397371f705f0ff23ec448832f956d110",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d370g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d370g0v0Filler.json
new file mode 100644
index 000000000..d14a53d6d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d370g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d370g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101726064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1b62adc2a865beaa5c50c77330c26c3211a0de5c06455c7f3809e92f6804e846",
+                        "s" : "0x55deba7a42d58773a453b46fea28901ddc3ceae52c2884c974cc46ee2f594a8d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d371g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d371g0v0Filler.json
new file mode 100644
index 000000000..367bab851
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d371g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d371g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101736064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x689ab5e0782c37e5a3721e4ae66ed6d428ec923940d6115b9f34e4a63352bc8e",
+                        "s" : "0x3663cd539b9c87d37947c1542d0546ec8d8c08c16dbd66dbab6d65813fd140ed",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d372g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d372g0v0Filler.json
new file mode 100644
index 000000000..2a77fc349
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d372g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d372g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101746064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x978aeac32ceed30cb56d31e6ae04f2ae583ee6221d9ad1d1187935ce77ae9a9d",
+                        "s" : "0x58c048da73b560406ac8b5290b489b83cc5730fac0bf43b20312148738f2bb42",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d373g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d373g0v0Filler.json
new file mode 100644
index 000000000..23209a694
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d373g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d373g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101756064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x95481b98545530be61681a7dd012b022ad075ecee1a35d67002a5f2020e3b322",
+                        "s" : "0x76a983d877efdc750b372174cb8b98294bfab6a6405a1287c46028cb1d20115f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d374g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d374g0v0Filler.json
new file mode 100644
index 000000000..f4f815360
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d374g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d374g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101766064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xac6dc36e9dc84527bface2f7a78120e3fbf4c0a6173475ed0cecc6e88b17aaee",
+                        "s" : "0x09a351ea403845dfda573ead2c4193c816b9f7d6ffb470740baf8119aab70962",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d375g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d375g0v0Filler.json
new file mode 100644
index 000000000..57a9b32bd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d375g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d375g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101776064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfc5064bbfed54a771b8da55b24e2ddd7dd173ec0097d7b4ff8e1b1add4d946d7",
+                        "s" : "0x7ce2293fc1bce0eca8700b6de0c1a7b0b01c8e422a12c58369ed87f0bb46f79d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d376g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d376g0v0Filler.json
new file mode 100644
index 000000000..ad08102ba
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d376g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d376g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101786064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9ca3f2d940070b1919baeeb6c996b893412908c7c9abe89821da4540f532c302",
+                        "s" : "0x75e61e75bb955f633219d68ac9761f07777c1cae6a47c2089f7bef1ab537c7dc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d377g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d377g0v0Filler.json
new file mode 100644
index 000000000..c9e087aee
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d377g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d377g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101796064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3c7c854e43b74be2d49e70ce48a5b4f6583ac71b89bc982807113c918e0970e2",
+                        "s" : "0x7fe94d908a0ed788c2e17399d7087bce2125d3cc91743d1901c87c9a8eed5b56",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d378g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d378g0v0Filler.json
new file mode 100644
index 000000000..5b2ae05c2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d378g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d378g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61017a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7ead1412ba74400feebd86dd940e5329b19b1c069da23a67be20f4a563f9a50a",
+                        "s" : "0x68c498df4be20c6211f1daa06ad81d359beb0e7c061b9a3986dfbfda1f37c1cf",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d379g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d379g0v0Filler.json
new file mode 100644
index 000000000..386caaf7e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d379g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d379g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61017b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8a855803dbc324f46ba161ffb20412bbbad8222e48d9196e1d189986971fcc0a",
+                        "s" : "0x09618fc6b843a80d80583af51966d8f178cd27db5804dac636e15919f0744b79",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d37g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d37g0v0Filler.json
new file mode 100644
index 000000000..ab5a876b6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d37g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d37g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60256064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe1f4d43cf12f417f85f692216d612532fdfd6bb9bed4a5216daf6c193d6a566d",
+                        "s" : "0x7dc19f6cf029be8741fa71459278015c47fb2a87b73c2f799280b149ff103e92",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d380g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d380g0v0Filler.json
new file mode 100644
index 000000000..4913d8df5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d380g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d380g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61017c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8759a48be7e86cc4b5d03cb2da043fc5b32ff263714beed4dfc55b7fc86f5909",
+                        "s" : "0x1e0a444ad6fd7e08cd2ba61dee6cf9949ffd1157a53458d7fef6d29870d64326",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d381g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d381g0v0Filler.json
new file mode 100644
index 000000000..1a6c7b389
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d381g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d381g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61017d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcb91e852f88e637e6d66cd382df87869d8164803aeb41f0c618981bd24b1eef4",
+                        "s" : "0x5c024c0812fa8261166417c7af12c9ca2f6287dd5e82a9106ba8d9649c33ae6d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d382g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d382g0v0Filler.json
new file mode 100644
index 000000000..61a5bfa2f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d382g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d382g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61017e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x61eec042e5e079e88f7a675ab7ab2753b379ae11c09c09b5faa24cbe014ff4cc",
+                        "s" : "0x6e5368f5c2c88e986de8dbae576e4cf0d200e858fbe733a8a6485be150c8c038",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d383g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d383g0v0Filler.json
new file mode 100644
index 000000000..eb3934d7a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d383g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d383g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61017f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeac2829da1aa35edfbe7d78b8a9ab39f85a85c8d8488fdeef327d9f97b3d494e",
+                        "s" : "0x4a78d85a3094df2d76f01b09182ba468871fea3893b17cc2ec99a3311a5a79ed",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d384g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d384g0v0Filler.json
new file mode 100644
index 000000000..5ead2a515
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d384g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d384g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101806064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9f488c15b8515556366c2a0595747013a6c9f9cd731d57b5a1c4a09f4d53732a",
+                        "s" : "0x1c130649d17a7004f56d6b361b59293a7d70be1940bfc73a3262b2f6d51df92c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d385g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d385g0v0Filler.json
new file mode 100644
index 000000000..19d0f8fd2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d385g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d385g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101816064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcb6dcc7585922fbfb6b2a1d2e1381eb5e42efb6a60598624446f2a3ca1b445c0",
+                        "s" : "0x4360f69faa583227fdce5dbd4da97d2a73fdb8e062cef0e2bc236e67436099f2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d386g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d386g0v0Filler.json
new file mode 100644
index 000000000..51b96be54
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d386g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d386g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101826064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa7671df4850d2224734e4bcc6ab333b16ec5faabc2e69f261dff441f79bda8f7",
+                        "s" : "0x53701855dfff0afecab4ae3a842d7c0bb2b1be037b8b50a74bae9cfd863eebb6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d387g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d387g0v0Filler.json
new file mode 100644
index 000000000..f047aebe6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d387g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d387g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101836064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb60fef6c6c55f95a7b5c5ea067f749f31cdf46ac09618cc6d74382b992da46b4",
+                        "s" : "0x72ab02825bf37d516e3ed259b3b4150d72127acd9706569c81096bb039408f15",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d388g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d388g0v0Filler.json
new file mode 100644
index 000000000..c10d03d66
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d388g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d388g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101846064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaf96f847b6bbcb6c46cf1e464be76924ab958b1bc03586cf5cf0df54904e8024",
+                        "s" : "0x487b22baaff6f9dcffc444b40dcbb153ab33a8592ebd90a3e076bfc2e8d7e9f6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d389g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d389g0v0Filler.json
new file mode 100644
index 000000000..fe1610790
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d389g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d389g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101856064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd7bb65f473464a288cb5079b80fcfd4bcfac2150c24b990561ed38a544f4f53c",
+                        "s" : "0x3862d8d97fd6681a5573f52de4cf2b5ae3f9349335e168c6a97ec2ffb4c2f275",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d38g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d38g0v0Filler.json
new file mode 100644
index 000000000..d44a17626
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d38g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d38g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60266064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x29a77a9c9c7ddad197330b0c4f39690aa9d18bb08d903a8e7c04f29f69113049",
+                        "s" : "0x78137cbe6fd627443987821ecd387ab5d407b91313371bb74f198e79fea6b32f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d390g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d390g0v0Filler.json
new file mode 100644
index 000000000..745668a84
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d390g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d390g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101866064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb4b31e1bdf7c8af6278815f68248f1bb623c5aed74e2f07219028683fd4837ad",
+                        "s" : "0x4e40df481b9780b635c8d1a66266a6caea845c963580f6bb5a9235f168880819",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d391g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d391g0v0Filler.json
new file mode 100644
index 000000000..d4fb3e768
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d391g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d391g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101876064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x123cda48298d639a7aad248e7211fb9fe1d1ca57f188181152518b011edbea9b",
+                        "s" : "0x3379e8001bd81c7eb3f9f0d84ae0cd5e7ecaa85d384c71c0f83a4769834c288a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d392g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d392g0v0Filler.json
new file mode 100644
index 000000000..4e89a9079
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d392g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d392g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101886064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa02d193aed27b07f27d4a22b8e015c4c35a1935b5941684ea0102c83aa9d3a61",
+                        "s" : "0x27ee2af4830a28ba5a2d1454e0de34f46c4f28a01950f0c0d738cf6bf4be1e8b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d393g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d393g0v0Filler.json
new file mode 100644
index 000000000..c862a6233
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d393g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d393g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101896064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x90f2ff265a22867726bfe94b397aec9d53844272a34eaf14e124f8e06c5207d4",
+                        "s" : "0x1aa202da8c44591f48c046d221d27ff01313029562436f5577bdf8c22afa949c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d394g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d394g0v0Filler.json
new file mode 100644
index 000000000..25fe41227
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d394g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d394g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61018a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5e764f50ccb98a0d6738b1aadd30c745245f8a8e6275b3b329c06b6a045615be",
+                        "s" : "0x3d94fb24ae80a344f5bebba3b9b1dc03a5785742e62e3edbb1b09488918772db",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d395g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d395g0v0Filler.json
new file mode 100644
index 000000000..eca5d6fe4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d395g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d395g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61018b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4502ec3a9f3269cd204c582dae816db347ea8945d7eb54bb3bc5fa0a390ad5fc",
+                        "s" : "0x09e1fb1c690e57d470e31ac57b034f37aeb9fc1a26c37845db39c0e9ac28f4b1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d396g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d396g0v0Filler.json
new file mode 100644
index 000000000..e53022fe9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d396g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d396g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61018c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc059eb136dd599d26cd72447c7905f359e93bc020e2f26c88ab5999f425daaa",
+                        "s" : "0x4e0857dd53eee99a0197ed04100afd665fa4d451b6ebb65d07d2e631335c004b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d397g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d397g0v0Filler.json
new file mode 100644
index 000000000..8914e005e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d397g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d397g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61018d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xda4cdee1838c39052e7d12a74b04dd3de03ab91aa59dae123010b0f5691fec33",
+                        "s" : "0x7f65f01a4631948e51e0e64b6132c979eaee31a6fe3a4863a74eebf0aa1a6b95",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d398g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d398g0v0Filler.json
new file mode 100644
index 000000000..fa1bacb8e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d398g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d398g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61018e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf10447a7ef15704e68b5bec2ce9d0abb7bdd41efbe2a0549ecc3560fd654d46a",
+                        "s" : "0x76bdc2b09f36b5c253475a5a9404a467b37b73bcd4d45f6a2679db30feb1274d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d399g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d399g0v0Filler.json
new file mode 100644
index 000000000..df2e6340a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d399g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d399g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61018f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x67fb7b016d1b3a7f16af5c7f97dd510ae9f9df58bb9ea941ffd39261a9c58580",
+                        "s" : "0x29b643fa32849d8f9845c4358c3294ee26d90adbb54fe5e7008689d31b68ef3c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d39g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d39g0v0Filler.json
new file mode 100644
index 000000000..a7b0debe3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d39g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d39g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60276064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb7273d2774adc88d9f468c64dc56408cce4ce4c42127d701f1c2f96d4cf23268",
+                        "s" : "0x40f632b0726fc5c081391582310ebd551267b3df79b5f8729c9fcdaecb87d4e2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d3g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d3g0v0Filler.json
new file mode 100644
index 000000000..2540ac7aa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d3g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d3g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60036064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4b6abce292752ace75d332e3dc618f6ccb5e4bec3489f2a6751cd0c4cfdcde71",
+                        "s" : "0x4fd1913ce4ee6c85e8f54ec24f9f709960546f91a9657baaea9ed25e80d5b7ff",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d400g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d400g0v0Filler.json
new file mode 100644
index 000000000..88de4cde1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d400g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d400g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101906064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7661445d49023fefe880ffeb7cd68b62e4b1c51559107f5850cbbe4befd0acb2",
+                        "s" : "0x4feed9496281d65ca50aacab2969a51d9c07607db4160dab74d64c61e7973ad6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d401g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d401g0v0Filler.json
new file mode 100644
index 000000000..6acec684f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d401g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d401g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101916064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd93bf3d673a8f60f66fb4e8c69993006e14ccd871f00b7d2d7cdbb3374945b40",
+                        "s" : "0x2d3b9c6fcfdd8a458b5a3a6c9f4e8cf2358e2aa725446ed9a0d37af887f4c3eb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d402g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d402g0v0Filler.json
new file mode 100644
index 000000000..946d30fdb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d402g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d402g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101926064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdbf4dd60a58180ce5909fea663f06ee81f447a2789e719f3853c238e6134276a",
+                        "s" : "0x102af7ae55544dec0d5f8e368fe7d9c21c5931c928648e5fd1b08bca3bdfef1c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d403g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d403g0v0Filler.json
new file mode 100644
index 000000000..42b5760d9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d403g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d403g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101936064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6a0985d7e3587fc03710cf388090c2887842f5a58970d39b18a0de9b5c641bb1",
+                        "s" : "0x7f979225d0ad9b5b93960d2a2b499e3b295c8aaee592a998fc0176cbe1de5020",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d404g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d404g0v0Filler.json
new file mode 100644
index 000000000..f566d6fb6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d404g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d404g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101946064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1abacb47e2d4be359e9a7dc4e9a80edf6dba4bac9b8bd34488c41764b6463d2e",
+                        "s" : "0x5eb3e895f3b5dd1a028c1d6a90ecf37a2ef9d6c91b89332cc31415e824b013be",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d405g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d405g0v0Filler.json
new file mode 100644
index 000000000..d3bb07ae3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d405g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d405g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101956064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbdf2a6977dda95eb923b60083bd45996ce9cbef6a13eae7718892ed6e05d6647",
+                        "s" : "0x5587f73c024612a11b4baa8da854fe3d0334d419438c9cd4c3a43c001ee3a791",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d406g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d406g0v0Filler.json
new file mode 100644
index 000000000..8d920660e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d406g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d406g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101966064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x06130aa880d7b55a443175673eda9a7f3843b04d0dca4552d97ae73e58e212e0",
+                        "s" : "0x4b3ea938c84a53513eb95059678af808c2dd35e7def71302134d140e07bdbd4a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d407g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d407g0v0Filler.json
new file mode 100644
index 000000000..9323de9ba
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d407g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d407g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101976064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x43fe126e93074d50dac249ec8ee55e3f8e6ee48c786491eaa16c7520e7ef3c5d",
+                        "s" : "0x1956d127edaa9b7fc7d6dea24ff9619ed80774d5a76f37e455f4b055484ec37f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d408g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d408g0v0Filler.json
new file mode 100644
index 000000000..6e3186a44
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d408g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d408g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101986064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x095073702fb68f8bd91a1f1a494c8c15ef7cab61f07b99bcc0cf591b3e4855f9",
+                        "s" : "0x12594fc00c6d22d278e5ddc1bec966f6a98970260d725acbde7ad0b11bbab67d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d409g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d409g0v0Filler.json
new file mode 100644
index 000000000..4600d14a3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d409g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d409g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101996064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc23e474d82111aac9d3b7fd33e3b043e49fe54ae4fa8a8adae69e650ff53fac6",
+                        "s" : "0x1f5ee2d93d9cb25f34f06a01723a49031bce9337b4e0ca1cc0e0f0dab636c6de",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d40g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d40g0v0Filler.json
new file mode 100644
index 000000000..e2a06aae1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d40g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d40g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60286064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7f3acdcb358725b68c0aee3d7ba67e31a7364b771fd94bb206c6094c8f6e500b",
+                        "s" : "0x11e60f8bd2646e8175802a48261e3c3dc39b35e8967b28257b8ae65cedf83b83",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d410g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d410g0v0Filler.json
new file mode 100644
index 000000000..e54181382
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d410g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d410g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61019a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x13d22c629e141abe21daaba5127ee41f05fd2880a2487b8231779647c6f03d03",
+                        "s" : "0x096189caa48ab14052cf0ea884f855d76a94c935560b5b481ab2ec37cc95db3f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d411g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d411g0v0Filler.json
new file mode 100644
index 000000000..24f0787d4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d411g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d411g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61019b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x64f7372784dc4a641fe34b8554042316b12c55481423f2095a6298b803d41eba",
+                        "s" : "0x2e861a2c37897de23f37e4f22646fc143b051bbaa34d88644af8c63f55a22ea0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d412g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d412g0v0Filler.json
new file mode 100644
index 000000000..a38fa423e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d412g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d412g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61019c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb68c9fbffa2bba1e986ed16ed03a96a23d48b9af79867b58729199a657355561",
+                        "s" : "0x2bd71cae89c083a7e09051c8827701b628fbf7174c781e91fa711d9100026bff",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d413g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d413g0v0Filler.json
new file mode 100644
index 000000000..34d0b0c3c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d413g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d413g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61019d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0d15b63068153b917f91658e9d9eba75c62ee0b920d000fd5f1208b32e3e436a",
+                        "s" : "0x6b731568d2e1a9f2a88e6f246860214c9042073571882d7da7373a81c0b20720",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d414g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d414g0v0Filler.json
new file mode 100644
index 000000000..f253faf31
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d414g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d414g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61019e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x13d876099667c9f6178063dcc8e84590cc253ab1fdb03c8399b960b90976f63c",
+                        "s" : "0x64da6281fed7a6e791edd291ea7335d1322e859504c82377e18b46ce36cf6633",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d415g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d415g0v0Filler.json
new file mode 100644
index 000000000..88b634266
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d415g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d415g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61019f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x48e900d01fdd265a74acedd54f49be7dd1da6a402e4c83aa4a08805f222892eb",
+                        "s" : "0x394981e66dae3b7a05ab5f611feaf15d87a55e61551610fec0fb45b699e446b4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d416g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d416g0v0Filler.json
new file mode 100644
index 000000000..a9fe2cae6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d416g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d416g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101a06064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2cf1adf0815eff7f5178d216c72fbe09811e09987d3ab2a7df953bd29acd2780",
+                        "s" : "0x2811de4766367dd8c4e2b5312b5b9ec861e550d1225c01eea1e04532738bce52",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d417g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d417g0v0Filler.json
new file mode 100644
index 000000000..58745caee
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d417g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d417g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101a16064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x08ac02cc5060b5f90485aed2600af53d9026704326dd46b58b1f841156711805",
+                        "s" : "0x631d0414b092cd453f31e364141243b7511ae38124ff74f231f6c50eb6b05ce6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d418g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d418g0v0Filler.json
new file mode 100644
index 000000000..ea097d2cc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d418g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d418g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101a26064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x60da049dd03abe5de6d7dc7fb2bdfe25b3264a35643e02c1480a114ffbfe57b5",
+                        "s" : "0x2c8d29205512682185421d6d66af749cdcd1f3e4bcf99f80fd510e1c2f989ad8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d419g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d419g0v0Filler.json
new file mode 100644
index 000000000..51deeccea
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d419g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d419g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101a36064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1aec3970e77b97d829a536c9a31e22f8e1a57bf350270e6f5ca337693ca81f6c",
+                        "s" : "0x307911715c347d171bbb7943b7e43943b821dbec94c516414ae0eeac9c8aeec7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d41g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d41g0v0Filler.json
new file mode 100644
index 000000000..6bbe8c5c4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d41g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d41g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60296064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8b29f147400e712bb215ed7de3a2d63c998c9e0fd7b64f271db6c9a472d47159",
+                        "s" : "0x5e7623435e1b9b42db33a67b093cf8e992af1dafee0c39739471b61b91fec54a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d420g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d420g0v0Filler.json
new file mode 100644
index 000000000..62c62a2be
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d420g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d420g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101a46064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x23c5c08a37ccd78f5cdfca3ee78a0dac011f81bfedb770b22ed2dae8097c28df",
+                        "s" : "0x546a5449103ba791d5bfcf9008f844932048f82eebc8bff620289be36ac1c99c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d421g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d421g0v0Filler.json
new file mode 100644
index 000000000..4b4f2cf47
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d421g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d421g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101a56064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x30583377ef70017acafe551c63d416aba2f67bda61f80e497c1fad8f6e21ca8f",
+                        "s" : "0x4e1c6d7573ff36e328fd48bf735618ea388b10acd00cf532a5ff079644a9a5cf",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d422g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d422g0v0Filler.json
new file mode 100644
index 000000000..f163a344c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d422g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d422g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101a66064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb5055f6400dfeb62d2c84626ebdfced7f3e3042f109376a856a26f94e561e88d",
+                        "s" : "0x6e97663b4e665282cb16fd273ffc6b5e05fa2d277325d86e55c59adb484beeb9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d423g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d423g0v0Filler.json
new file mode 100644
index 000000000..f9e719fc0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d423g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d423g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101a76064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x528ae2df6c0e79604fbc8b1514b53fbe79f4a3b312f1267891d1fb175730b88b",
+                        "s" : "0x51d3b6da79174af0dc0ed3aad7502d472694cd07fe71c8b78aeef57d71a325e2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d424g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d424g0v0Filler.json
new file mode 100644
index 000000000..b2519dbc8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d424g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d424g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101a86064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd1c3231090083d1a9dd23696aa3802af368caa3272b4cf42fccd01f14e1f914d",
+                        "s" : "0x24cc4341e0b9336eb07f9b16a1fd9aecc6cc9b1289cd2a10139bb9ea83a65e53",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d425g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d425g0v0Filler.json
new file mode 100644
index 000000000..ad29e3b44
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d425g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d425g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101a96064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x601ce19694bfbecfca6709cb2d65f43324e21f06b1ef404793c2a3c3be526722",
+                        "s" : "0x66353e3254928a33f66867776c0918f712f55438c75f1b83243592298cc72b7b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d426g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d426g0v0Filler.json
new file mode 100644
index 000000000..62afaebeb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d426g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d426g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101aa6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf4d781d51cedf258c99343e0a4e6fa9ff09557d977687810aab469f3b7feb93e",
+                        "s" : "0x7565b06e17dcaf0a26742b4c235315d34a7575cbd57e8d3584a3f8ca5466db9e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d427g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d427g0v0Filler.json
new file mode 100644
index 000000000..216418b8d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d427g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d427g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ab6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x080c004226c6b5e39577ed6d8fbe99023237495e3f9e831711cfdbd143186f5a",
+                        "s" : "0x4fc9872a608cc4a7e38a27476e7f236e180df5482d764201653bfadccd51e41a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d428g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d428g0v0Filler.json
new file mode 100644
index 000000000..332b2af57
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d428g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d428g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ac6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1a36d8d11f92aa8ae2727f41e5d811e7ccda3edce9b779f49893e49528674d57",
+                        "s" : "0x4d018c3d8347f7d765dc6f02823a1dec1e56a0efc17cfb47b34c586a87804a6c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d429g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d429g0v0Filler.json
new file mode 100644
index 000000000..6fd3efadf
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d429g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d429g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ad6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf2c693457a35f71a6c8c329f8b8418c942f77be1a613cfa3352e267bca96963d",
+                        "s" : "0x04e8c39025d36123c315caf047901e8759188c06ff997b2bb245a5c6abebdbed",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d42g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d42g0v0Filler.json
new file mode 100644
index 000000000..8ffce77c1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d42g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d42g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x602a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x04a9901f8f67c9cab61c70cc618de98d55379381a3abb4379bac6fb6391cb71e",
+                        "s" : "0xd0563f1a47b199dbd043c7738604937b64961fe03757b19058d8fe0651795e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d430g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d430g0v0Filler.json
new file mode 100644
index 000000000..758a9fae5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d430g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d430g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ae6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6caf6490ba572413eff9c1ca93675d080b217bccdffb82ec5eae62f6376683a5",
+                        "s" : "0x2be10d93a88feec9bed3d1468cdf5d22a7868e185579150de5fe44e5e26d9b25",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d431g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d431g0v0Filler.json
new file mode 100644
index 000000000..cd08e8d4b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d431g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d431g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101af6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4237a0be1b6d2ccfa3dadb3c0ccfb12cc316e6f6207d3722d172f5ac58116a7e",
+                        "s" : "0x4c442f022c42341104e2aa02d898c297b01bb863649964f52e0087589411eb37",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d432g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d432g0v0Filler.json
new file mode 100644
index 000000000..10d120a83
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d432g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d432g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101b06064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x274f3da464847ac0541980cc91c83c75a60c74803c737b4fadaab4ae92f08742",
+                        "s" : "0xa89c29669e015e1d9b2e2e7715b7aac524c7b4528993b489dde319b8c0c26a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d433g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d433g0v0Filler.json
new file mode 100644
index 000000000..a71950e36
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d433g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d433g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101b16064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeaab4e49fac2505046be4a95fdc480d2b467ca46b97413fe1eba5c8907651b0b",
+                        "s" : "0x035b80d53c9539d37efcd27c3377f80996f354e9614d5267dcf057b79f44488d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d434g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d434g0v0Filler.json
new file mode 100644
index 000000000..b390bd348
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d434g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d434g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101b26064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x10bed65266f688bf3574fa1e3d8ab6dd7fb2752a368b605d3af65a0fac591650",
+                        "s" : "0x491fd609e1fee57ac7cdbc0d1637040bce0df95c1d83e099cace102f7563a8e7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d435g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d435g0v0Filler.json
new file mode 100644
index 000000000..3a2d53b4d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d435g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d435g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101b36064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf8b0efb89b3145b909586512fadae5a455126de964d3917a9026b26e1aad3c94",
+                        "s" : "0x368d6450a2e4032bafabb66b50db49f6c8ccde26e044fa8b327ba85de5c36928",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d436g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d436g0v0Filler.json
new file mode 100644
index 000000000..34feab4cb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d436g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d436g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101b46064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5989865594620f5bdab71d2c19781f8802582bdb2dca39ff252e059f63059cd4",
+                        "s" : "0x0baea4c13d9fb2d723506c1b2a407bf6a880de9eed6ea38ad4104d2374b0bc20",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d437g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d437g0v0Filler.json
new file mode 100644
index 000000000..3761d03d7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d437g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d437g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101b56064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6d23c5d22974a7a55e6ab699c48b651444183faf8f455515c49facc552938760",
+                        "s" : "0x60cf330f390cfca595e13b968c565878c9fbf143f080dfc67bd6d6fdf7becfdf",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d438g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d438g0v0Filler.json
new file mode 100644
index 000000000..afc0d99ac
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d438g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d438g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101b66064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x08de7c0df794adf6048ad3cd2489e669c379ff1928eb0297295e2206fb76384d",
+                        "s" : "0x42e1c29379d1e6138ea5f0d94d7a58d7df209385f5b826f817bb57368741a010",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d439g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d439g0v0Filler.json
new file mode 100644
index 000000000..da88588ab
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d439g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d439g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101b76064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd5271b39c8cab42e4e3ed09ae8b5cef55a54e54f03fc646687e2a2454b9b934c",
+                        "s" : "0x32fa49db04f8fbad68114bd34fe3eb41c30c987b44323fd0c7a1f7f01b45b374",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d43g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d43g0v0Filler.json
new file mode 100644
index 000000000..d99e54cc7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d43g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d43g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x602b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4bb148d6b2fd2c133f837494ae3ef057b50d77c00dbf1f7762de8b0676922472",
+                        "s" : "0x2c3b69bfc9721e1e5cad992f4eb2d2ca54e419b94a1ec4d59ee79eb6cb2ef2ba",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d440g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d440g0v0Filler.json
new file mode 100644
index 000000000..d31e1a15f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d440g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d440g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101b86064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x76dfc4fc8b479616997ae2d8027388c9cc1185581d11642d196990d1c5697f88",
+                        "s" : "0x09bd9bcb868e167dd62c5aee4c52d1663b60c2321fc2aa3c07306435c1089658",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d441g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d441g0v0Filler.json
new file mode 100644
index 000000000..597c5148b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d441g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d441g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101b96064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0d5e8693c99ef31e032bed49213b80280a17c9eb76aba6e156dc418ba392c58d",
+                        "s" : "0x333aba7d90127dc9ca8222166df7e36b9918f018890e933fa5115fb0907f27d5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d442g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d442g0v0Filler.json
new file mode 100644
index 000000000..bec90d349
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d442g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d442g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ba6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf7198ad4a2b2e9e903216c9019c8fc1850afbca05d814b5c519192bc8cf80b56",
+                        "s" : "0x71df8ab17e268d7a58c0358206a8688decfb1665bcab30d702c07cb0389fcb97",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d443g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d443g0v0Filler.json
new file mode 100644
index 000000000..104af7158
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d443g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d443g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101bb6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x11c771573575b7cc990dee0a296ac6f37a6d29616e65dcf14c214ffd81ff500d",
+                        "s" : "0x1a3a834e96170324f42a0ddadb8ded465a8fc25f7b1342a6528ad6127840ee96",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d444g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d444g0v0Filler.json
new file mode 100644
index 000000000..26b35e445
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d444g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d444g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101bc6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfce4dd95981aa3b86ff9e016141a9dbd7efe3836b5fe2f95f9289b219a6ee78f",
+                        "s" : "0x3f5d231ecafb87884a4f7bb0f0b5a508ca151811e466a2a3ce4ae2fe3f0abb03",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d445g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d445g0v0Filler.json
new file mode 100644
index 000000000..beac96e93
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d445g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d445g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101bd6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xce306c7401b928b2f36339c236779fffd970fe6bd0a49d5fcc38f5098b166bf2",
+                        "s" : "0x7907183038b2129c511a4a11c6435d81f07bdb693b14cbd6ffbd96945f303b81",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d446g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d446g0v0Filler.json
new file mode 100644
index 000000000..5d0ad4a55
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d446g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d446g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101be6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x183a25d17e87ac9661b317d2b34e236febb6b970e34967524616c5b757d188cf",
+                        "s" : "0x139de92541b8b0062a6b24ec472a336e713003a6f363e8ad7a7b7955972ad7d0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d447g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d447g0v0Filler.json
new file mode 100644
index 000000000..51c5ca3b4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d447g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d447g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101bf6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x748976b99cb788d375a934959fbe0ed887c5533e8e0c2863148d43a64e5263fd",
+                        "s" : "0x55a9d69b9f03dbda123a5f30aa1e392c45ad5b2599f46bb1c9eea344a48a537f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d448g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d448g0v0Filler.json
new file mode 100644
index 000000000..191efe555
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d448g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d448g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101c06064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa7db57f25ad15e687542bf1c84626c2144fc11fa168bd33e142d1603d161fad3",
+                        "s" : "0x65f5a763ae21969b89fdd6a459077155b770c647c10fe0169f9511c14cbdeeb8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d449g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d449g0v0Filler.json
new file mode 100644
index 000000000..0e0673197
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d449g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d449g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101c16064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5329ca6f64473a734d6f3b2ffea46372a77d050390ca42de669ce8812ea46e08",
+                        "s" : "0x779bf0bc08752b74017bc71bce8c60eb09ca27a07338befd062e9bf4d2e33d06",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d44g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d44g0v0Filler.json
new file mode 100644
index 000000000..3c2087d86
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d44g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d44g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x602c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x825391907e47fd0b0c9a9f101c6a68d0062e6eecfbf9a7a6cc0f2f632f045bdb",
+                        "s" : "0x7755773794d1fdd55fd60097d4917c47d6cf0a20a04909a2bb2fc0940485ace7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d450g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d450g0v0Filler.json
new file mode 100644
index 000000000..e2402384a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d450g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d450g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101c26064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd76406b9ad65786234b779322e9a816a598f6b033495f974ed5a67f131b57b70",
+                        "s" : "0x384108727546021c0635249d0fe974b73aa419462cf5b406c104726ae3a37bbe",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d451g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d451g0v0Filler.json
new file mode 100644
index 000000000..776e21084
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d451g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d451g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101c36064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x08c2857b9fdb6954eec354dcfc21b3e5a43a9921241c99f17f10615408aa312b",
+                        "s" : "0x666962638a9c578b2859555c4d05d8168e5deb8088cdab77717df3e1c74d148d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d452g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d452g0v0Filler.json
new file mode 100644
index 000000000..e13116aeb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d452g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d452g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101c46064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd2e2285d7b19da442465b881c85cf304b1561b47c1d9a5700d908acf7125b56e",
+                        "s" : "0x75eb834832bf1e49c83c8fd67e6515ae916c91ba7061d5cdeeb2c51a849062cc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d453g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d453g0v0Filler.json
new file mode 100644
index 000000000..d69286c47
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d453g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d453g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101c56064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfffd109bafd87dab05a5b628fd16adb479db300f482e977b881c40ceae8f7939",
+                        "s" : "0x344b3d465dfe98552a80085f50fad9e600d9489d573c3b9d46abdd070b4efdfa",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d454g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d454g0v0Filler.json
new file mode 100644
index 000000000..8ee47e9d7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d454g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d454g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101c66064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0ea55c17cb9e62deb9abc950a7fdd746e105b4ebcd1fbec30b938bd8cba168",
+                        "s" : "0x6837edda6f815032d214c6854c4a71490bdd415bbf8716c0ed2e66b3c6a63025",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d455g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d455g0v0Filler.json
new file mode 100644
index 000000000..20681c1e3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d455g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d455g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101c76064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe3664cf0e92b8b7f8f0f5c347a7db470da87999d1b505a9042c4324323264297",
+                        "s" : "0x4c8e82a56b7e662593963ff28d95d7ec86a6c42a92d2c9d5e6ed940572149bc8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d456g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d456g0v0Filler.json
new file mode 100644
index 000000000..58e56e4be
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d456g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d456g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101c86064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2e4ff877a4a5583caaee62a271ca05d6c82b1872c7bff749724c9de4922433fd",
+                        "s" : "0x3be784f16396bb363ad14caf0aff4a549a7e5aa063c1e452e47d23da297c4e8f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d457g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d457g0v0Filler.json
new file mode 100644
index 000000000..6075fdb99
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d457g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d457g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101c96064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xebcab3f1f8d690abf3a24bdbd239cab6114c8cca3cc95e0b3a50b97d6454ead2",
+                        "s" : "0x63aea3126b5cf757916d7ca742b6490967ccbe243224a7f69231f90a121666b7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d458g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d458g0v0Filler.json
new file mode 100644
index 000000000..7c78d7ac8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d458g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d458g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ca6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdf060437d7e4860007582e3bd9bebd77e1e1bf73d811b9e9ecd377d6aa623b0c",
+                        "s" : "0x1a0d615ec51424fae7c57556e8a4116e722390400b655df6639292e7eb8c0d63",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d459g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d459g0v0Filler.json
new file mode 100644
index 000000000..c313ce327
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d459g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d459g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101cb6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6ffa54e11a29d428fe88da0e08db32ea15db0fa34f5505a92398c660d78fdbf9",
+                        "s" : "0x553e7d16e28b83c6fa9041bb2ce65b124ce759bef48b5c460ebe67bc7f46457d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d45g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d45g0v0Filler.json
new file mode 100644
index 000000000..743f8d4ae
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d45g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d45g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x602d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x16626a8a5d87aa43cd85f500acc10207ecf75c33c23fe8d627fed493faf6fc3b",
+                        "s" : "0x17588a1b4e03d6e2295d0248064cbff3313d134cc1ae3e704a4967c6f3ca7bb4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d460g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d460g0v0Filler.json
new file mode 100644
index 000000000..81d452702
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d460g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d460g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101cc6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9efca83b05a96b4a2e086039c12b2fbc5eef840f2a0fcbc0f635588e473d609a",
+                        "s" : "0x6d4e91c7a8feff48f2ff1b52baf5da3e5a201a021253a607ac09c1dd4e68dfc7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d461g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d461g0v0Filler.json
new file mode 100644
index 000000000..ff939df19
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d461g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d461g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101cd6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd1bd8049960518c136653fb56dc52573eae527790f0b818d414ad795b3f85bee",
+                        "s" : "0x5512cbae9ad57b88bd16f44f67a22d709d357aa6062d683984a199fc7250d746",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d462g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d462g0v0Filler.json
new file mode 100644
index 000000000..9880d006f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d462g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d462g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ce6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf1707da3a3ea50bd6707efcbd0543c257f871b773b994e9dbaeeb1e02e044017",
+                        "s" : "0x2dadb5fc680349f75a3cb699a14a42f4b82ef94ea31a061f69b3757241687467",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d463g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d463g0v0Filler.json
new file mode 100644
index 000000000..35685b016
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d463g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d463g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101cf6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc46f04d61b0bc837f12036d649c033e01535cc144f2a6151bf2d91fdc131f995",
+                        "s" : "0x465ca5ccc25beb47329184133e953cf4fa835bf89f53ec0b3cb9e0df743666e9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d464g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d464g0v0Filler.json
new file mode 100644
index 000000000..275569925
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d464g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d464g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101d06064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x957bc398ffa0b5f6242b762bc6eaa37fb82e10e4827f7b6db7099c8a4ed5d9dc",
+                        "s" : "0x7d5bc01f213625c5ac47046c6bf40aae10d4715f945d2bbf69aa3cd33cb8ba32",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d465g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d465g0v0Filler.json
new file mode 100644
index 000000000..2c30d2248
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d465g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d465g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101d16064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa05bdd4e21fe01875fdde7da9bf7bb4637d2fe71f75e8ebca3d4a3410e9e21ae",
+                        "s" : "0x3f694e821f1a07d5165157b10dff2031245fcd79f1c6e1dab4923122945d5651",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d466g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d466g0v0Filler.json
new file mode 100644
index 000000000..5f2fbf99c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d466g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d466g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101d26064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4d3faafdf89c8fa2eea0d50f5c6443c75e3c84cb3ff07ffb9a3676840ad82ad4",
+                        "s" : "0x2659595fd615004b81c09d9c6abae343f1e868d9279fdc3c34733a66dbf06101",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d467g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d467g0v0Filler.json
new file mode 100644
index 000000000..a6041210a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d467g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d467g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101d36064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc599848e0bd5029126a36180e536e7bea4621291f24ed1323a0c6088db1420ba",
+                        "s" : "0x532af38ddfcd8df0a4aeecaad2b6176d33e3412aa529c8cb8f19157ec4cf8aee",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d468g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d468g0v0Filler.json
new file mode 100644
index 000000000..15d8bfba7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d468g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d468g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101d46064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x49493d69f3e1b5959255727008bddcd733f07b35d937d7c8ba4b9e078ff07b11",
+                        "s" : "0x36b5a2a237b2050bbddcba1d88b5e528b8c795a00d478e8ab7e25dcba051c059",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d469g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d469g0v0Filler.json
new file mode 100644
index 000000000..f90e7f553
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d469g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d469g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101d56064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0bdee0921d49793f7adbe0e05c250aec693b92785e98f20778b47f7dae42e118",
+                        "s" : "0x3a179ac7cb227530a68460837cabc49d5ba08da3ffb73bbb04ea14ce0142d733",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d46g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d46g0v0Filler.json
new file mode 100644
index 000000000..13ed400b9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d46g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d46g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x602e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x420788db8d5bf52ff6dd2b7d03eddff31bfb7c496342915f9862fdf5aff849a2",
+                        "s" : "0x738924208229d014af9840826819db33dae5227b19e006c74811d21056c5d775",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d470g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d470g0v0Filler.json
new file mode 100644
index 000000000..dc5d0e6fb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d470g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d470g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101d66064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x03d9490d4b8110863cc9c1d1996ede89009e65b2a9cf7bfe5d7b8f83576e41ca",
+                        "s" : "0x3d273fc1a0c992a7df2d1a40e48b31bd839bbc222ed951f65f97ce9079737c1e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d471g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d471g0v0Filler.json
new file mode 100644
index 000000000..711d3d5c6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d471g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d471g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101d76064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1288b10010b29310119525ab4e4dfb315615500474ea0bdcaad28b1c1752bb9d",
+                        "s" : "0x2129835462acbd1f58a86b2839d22975777b25f94682631192df0fb3b7c98836",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d472g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d472g0v0Filler.json
new file mode 100644
index 000000000..7e23a1094
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d472g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d472g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101d86064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x231cff9e681c40191f5de3f69987c8e587599a64e5ca5225e91e03df2b295501",
+                        "s" : "0x0cd0df7d3f2f79b8e8ba88995f94a851036e4c58e76be0c7fa17280fb7f6c6c4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d473g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d473g0v0Filler.json
new file mode 100644
index 000000000..48bef2e91
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d473g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d473g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101d96064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9ceea6ef0484475521733829549a76db3438ae1b1d846f58c5e4acf2fab5b77a",
+                        "s" : "0x5101b0990df2aa44f302557997f794f835ec34f4327d37fcf220e26752e4d7e8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d474g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d474g0v0Filler.json
new file mode 100644
index 000000000..3fc29a9dc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d474g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d474g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101da6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x61b77fe659960982d05488c54cfa91fc986307f2d3bc23cc409404a95079ed55",
+                        "s" : "0x703cbcc5f9b19634cfabf733ba46edb2c4a7335dcfbc606a7aec1601eecd59ac",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d475g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d475g0v0Filler.json
new file mode 100644
index 000000000..3b7b0bb30
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d475g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d475g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101db6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5782663f68bb598d00e3a046d9eee1f4fc574e674561a02186fe02530e4d3b50",
+                        "s" : "0x0bcf6e0d14ed05b54dea72f87424bd8f541ed7502ced952543809f9e2dbc208f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d476g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d476g0v0Filler.json
new file mode 100644
index 000000000..a8d6e2709
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d476g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d476g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101dc6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x345d785bbca2a4bf485e8a54792a2749b8ad20194f7ac4cd4d837011391e9ba6",
+                        "s" : "0x4c4221fc4816903298b5eeb1e1e40713c07e328cc268556a536a9e06eb31d610",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d477g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d477g0v0Filler.json
new file mode 100644
index 000000000..9846fb3cd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d477g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d477g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101dd6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x88d109ffa476e7f26ef8749d4441fd5d701b2bb4dabbc3b357c54f53b30b8c12",
+                        "s" : "0x2fa1c789f5efdc61292d21f6caca5eab5375153283972f10ca2a28664eb2aec6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d478g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d478g0v0Filler.json
new file mode 100644
index 000000000..0ce65ed61
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d478g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d478g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101de6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1d313ce5197c2ea418850e51ec88cdc21107ee2e8565da53c9adad37fe1bf9af",
+                        "s" : "0x63f24ba74230982ef2d0d74ebac052ab749d1fc39eb335270d6c17382cff6756",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d479g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d479g0v0Filler.json
new file mode 100644
index 000000000..15a6743ec
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d479g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d479g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101df6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9ff6e77daf11c13210cc6858a128c7166f8d71caa262c5a5bc4adcd9cebe087c",
+                        "s" : "0x118d6ebb6a083bce0873eacdb1386c13c718038c73891d89de7ce1400ae8a040",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d47g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d47g0v0Filler.json
new file mode 100644
index 000000000..63dd8c708
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d47g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d47g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x602f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdd3fddb6f8aea7d5f0d603af115a5e07c80639f40c31cc68f463dde982bcd623",
+                        "s" : "0x44b51a9bd5b5f1da461fff0fc937c94c976bbd40e2935be544bd270105b24561",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d480g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d480g0v0Filler.json
new file mode 100644
index 000000000..6c4ca6423
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d480g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d480g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101e06064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdb31cb1cf3433397f40b4fcc6f731336a8ee311f7429662ebb5307d0c5986585",
+                        "s" : "0x202f2c4bf3c0ae328fc3304420f0f7390958ae263433a106f02575f23c3bc019",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d481g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d481g0v0Filler.json
new file mode 100644
index 000000000..a92966ce8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d481g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d481g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101e16064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4f3d6bcddca2b580da4b69defdd59c1d6af62eef672c985439a426adde470760",
+                        "s" : "0x5b0005e9aaf4a0b907685b87dd29d7d976780008d88f2188734010042a79966a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d482g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d482g0v0Filler.json
new file mode 100644
index 000000000..e8fe575cc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d482g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d482g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101e26064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x63deef5848cfe651faee7c3d7dbaba7d406e400cac5b44a0003dc50651b09aa9",
+                        "s" : "0x502433bd7f917ca7d18a98f5465e6463e58e4308073f3854e6fc8c9c645b610e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d483g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d483g0v0Filler.json
new file mode 100644
index 000000000..9bad7ee90
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d483g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d483g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101e36064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeb912d7faeea00b321446cb376e2172aefb1cebbb50ac54d437bbb4591b85503",
+                        "s" : "0x043086489b1b7b6e9dc8006fd266ba1405beb1368f76a519d4758d5b863e3af2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d484g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d484g0v0Filler.json
new file mode 100644
index 000000000..9ac6eb6ba
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d484g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d484g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101e46064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5b57c5270fa09730c458e321a2488db64137dab6b452d9ca192f2954ecb390ff",
+                        "s" : "0x16503ce464c61edee628e4f7627b29c7cb3b9dbd2a49c2b455d8f307c6e24191",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d485g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d485g0v0Filler.json
new file mode 100644
index 000000000..e090ed781
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d485g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d485g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101e56064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x32e75735dfd82df64e2eb58defc82c70cdeb43ccfde55b9102495f7d3cde309e",
+                        "s" : "0x7b4ee9dc5f66a12c66dd9766db75a9c6b8b73a38dd5fe162d51ccad9d6dfe2f6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d486g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d486g0v0Filler.json
new file mode 100644
index 000000000..bdaa68dce
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d486g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d486g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101e66064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x406b6f325b786b503e612994b61d0d5c7dbdef1f9af89c0f0e7f624f8bcf6492",
+                        "s" : "0x035c49b1c76a38e32548d15a76dd5e3285237004cec8c151ea2b0020d42cca56",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d487g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d487g0v0Filler.json
new file mode 100644
index 000000000..2e0e0a559
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d487g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d487g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101e76064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6e711f49920844dd795d534f4bb0ca903966ebb12f39010524fe969b8e7c0d2f",
+                        "s" : "0x05f959c67a63bd1f202a5c8e2bfce27a2b4852270007ea1b4f0e3322f9a4fec1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d488g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d488g0v0Filler.json
new file mode 100644
index 000000000..8e94fd860
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d488g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d488g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101e86064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd96af19e940a4cabf671e66f1dd8b4856df57bae397b480281d3f6a383b947dc",
+                        "s" : "0x05f0b288bb56436d78090dbfbfa91d22689ababe05a9c328f03304f1e042633a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d489g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d489g0v0Filler.json
new file mode 100644
index 000000000..080c2c5ae
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d489g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d489g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101e96064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x342f1584a987f9b17ecf89023d55240a7481d8d01972cf473e3a9c5ed8395e9e",
+                        "s" : "0x68fe2f0b810c6798f739ee8c477b390d5b614720ae770c851a0397670bc9e7f3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d48g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d48g0v0Filler.json
new file mode 100644
index 000000000..3999203a5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d48g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d48g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60306064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd311bce4c98dcb60615d7f0fa31ee64e8d4f507e5b6f2a72ac6f01a1cf76985b",
+                        "s" : "0x3ae94e3de8cd1ae5fefd4c22ba359ac091184fe80b39d1233f075e1decb50e88",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d490g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d490g0v0Filler.json
new file mode 100644
index 000000000..6b6086e20
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d490g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d490g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ea6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0806a0c634097e8c733dca88980a4006a246112515dc00fd91369152427be247",
+                        "s" : "0x7b22e43f32a241fc8fc72acc9d2bdabc0a70fc4983c2c8e9381b18b49d80f3cb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d491g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d491g0v0Filler.json
new file mode 100644
index 000000000..2de90eb4d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d491g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d491g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101eb6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf3c236b955eb4809a7482c126b6f15017f70e9cfce61b6d0a6873f5aa6623eca",
+                        "s" : "0x6528fb58b2542d3a69e2099b6acbbecc1016e04dd22205cbe01a82c9fa07d9c5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d492g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d492g0v0Filler.json
new file mode 100644
index 000000000..5c406ad58
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d492g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d492g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ec6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x159a256d5a7712264fe2d98bc063dd17c564a7e218deb113abfd32dee2152fa3",
+                        "s" : "0x5ab312ad2a5340ff76940dd75e033817f540e35224f0fe8aa9de959e0048bf56",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d493g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d493g0v0Filler.json
new file mode 100644
index 000000000..c3a1a1a79
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d493g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d493g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ed6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2561cf630b55f545e231eae44c3410ceb45e4f11a9e17683db20c49a5034f6b4",
+                        "s" : "0x077e3c77cad816d90fbeb304cacdb1d69063684936d8e6c0ea84c2a1ada8d026",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d494g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d494g0v0Filler.json
new file mode 100644
index 000000000..bd5522b28
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d494g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d494g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ee6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4957f9f5690c05f4309eec912e278b68670f40714a7e535404ae127afe733f44",
+                        "s" : "0x6b8fcfab4c584dacdfec86de293eebaa1adb5b7a5e93271231f3031ed95f537e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d495g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d495g0v0Filler.json
new file mode 100644
index 000000000..463099026
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d495g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d495g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ef6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x953ca5d44fe5909d100a82bb95a6f05971f75e3113b4a7f3e3c516c72b9be5f8",
+                        "s" : "0x03c8bc950c3e41115a250c0e5e74f6cf311a34537fa7e99790312ee515d9993e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d496g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d496g0v0Filler.json
new file mode 100644
index 000000000..5b236b44b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d496g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d496g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101f06064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4769adb7cb06375fe64579d1cb8136f28c901643802e67285e5120c60e8ba044",
+                        "s" : "0x18ee18f5a59ff3f1f23700e94b9a53c896aaf452758ddb7835ecb2ec07baa3ee",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d497g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d497g0v0Filler.json
new file mode 100644
index 000000000..664eeca8a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d497g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d497g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101f16064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0d8c1cecea21c6a22826b89eb48af2308bbbb4dca6bd584f2876bb167057ac28",
+                        "s" : "0x7e29e396868fc8dbd2c249b4725e144650b3d886e43668620c9316cc1571bbc1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d498g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d498g0v0Filler.json
new file mode 100644
index 000000000..8f683ec07
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d498g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d498g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101f26064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf380083f7f2888caba075ca612134378b94e19c9cd40a788ff7daf29db704caa",
+                        "s" : "0x50f782399107d7883f8b45c414955f89b4d13e1062b8b83840efe0a84e27f023",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d499g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d499g0v0Filler.json
new file mode 100644
index 000000000..796ec6b89
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d499g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d499g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101f36064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa7121f2b7e76942de7e3fa2b1b25a859fe8d980f289114c759126b984d5fa60e",
+                        "s" : "0x547391a2bb9ed7acfe9338718f9a89ab21d4bd55d0fb8d2d095f69d5dc0eff54",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d49g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d49g0v0Filler.json
new file mode 100644
index 000000000..bfc463e4f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d49g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d49g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60316064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdcfaa1fbbd648ae296787154aa4da1a5ae3f2b0ad8b9aeb1c0200f4e4127bc38",
+                        "s" : "0x73cdaf62ed3410db0442d2c3d14b7b61a25fc1ce18349a1c1055ca8bc933fdd7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d4g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d4g0v0Filler.json
new file mode 100644
index 000000000..2e9b42d30
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d4g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d4g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60046064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xba5a836bf24fa56cd43a835eeaeecca69776222d20fa20f9e746dc67862d565c",
+                        "s" : "0x2413cc251dd945e4f68323fbcadb3a0214d18633bc8449fb7ce180fa5696e2db",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d500g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d500g0v0Filler.json
new file mode 100644
index 000000000..a46a89c4f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d500g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d500g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101f46064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x50b8da9fc821fa7887850d7a28ad2bad67219f128f9d2e5d5e7c35a82fa6598e",
+                        "s" : "0x726bff1ad31fcc62498973401c0c8df71de3e5fe93ec9ffa3bf4684700abcc40",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d501g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d501g0v0Filler.json
new file mode 100644
index 000000000..29b65b970
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d501g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d501g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101f56064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf8f4a932dd120b95c2aa89ad43a39458e868cfabd2bf44de9361937ddab18039",
+                        "s" : "0x58d03c0f1bc878c8138a74f940973743f9af467f4bad8ee19786216ba6f58682",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d502g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d502g0v0Filler.json
new file mode 100644
index 000000000..ca289509e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d502g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d502g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101f66064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaa686373df172389d3048474ac14dda6cb543912682169e5c948791013ee80c4",
+                        "s" : "0x79e224d199ded0748bbc894c5ab62eee9ada09a77e9709686e448df33a9534e7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d503g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d503g0v0Filler.json
new file mode 100644
index 000000000..e32091c02
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d503g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d503g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101f76064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0aad9e3d058e531b1eb74cb83001a14c0dee1d1c267832fb277d6d81cb0aab60",
+                        "s" : "0x2af8206201494dd3bc2b1fbd850dd478df3ecde05d8c49491204c90f8d70a715",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d504g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d504g0v0Filler.json
new file mode 100644
index 000000000..571f174c6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d504g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d504g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101f86064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x46eaef20fdf4c3b2c6c49349534c310d465e0a646d87387743ba7ad75a104156",
+                        "s" : "0x561a25e483a15471a9391af84ed5c4994f10b23a85467c0924fa2e82506b4fad",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d505g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d505g0v0Filler.json
new file mode 100644
index 000000000..b33376239
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d505g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d505g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101f96064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4a563334dc18dfaa3ba1937de0ff7a6ec7a8201fe3e406b17738f1c54bf400a0",
+                        "s" : "0x0119575b3fe48fae99511b55effb978c2c2876efc390867d2e50bc6b706809a0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d506g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d506g0v0Filler.json
new file mode 100644
index 000000000..32c0474e5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d506g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d506g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101fa6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1b08aa88bc614d0a1d17dd8cd887e1479cc214f196910fc24dce5b187bd7c5ec",
+                        "s" : "0x3f8846f18662e49667492a221418661110ff6d21ce656863f3dfd04bdfcc58fd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d507g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d507g0v0Filler.json
new file mode 100644
index 000000000..e8d77d264
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d507g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d507g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101fb6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd88ca11a3839b7c6728591a6f9f21242649c08c57c39028b303de8a370375d3f",
+                        "s" : "0x20a128274c17258eabba176f0b162ee2123326a70888ca91ff803603df5beadd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d508g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d508g0v0Filler.json
new file mode 100644
index 000000000..be0e357cb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d508g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d508g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101fc6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x49ec270d2b630942cb6af93013441b0fa4e88c1394a329971681a80f6a7ed36d",
+                        "s" : "0x5b62fe075279ddcff14c504fe23b5a0db447a345ce7e5f99262beb358b3b1948",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d509g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d509g0v0Filler.json
new file mode 100644
index 000000000..8f1936b0b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d509g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d509g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101fd6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x09867c6a23470269ce4db0d7c2919566c23e916a008b8c2e80768e2a920b8eb3",
+                        "s" : "0x1cc4f18a2d5fd4afdba965711d5658a62b84869e9af67d4b970fa846f18e9189",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d50g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d50g0v0Filler.json
new file mode 100644
index 000000000..e98906dc3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d50g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d50g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60326064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7a86a5475141120e37482b020344bbfd275e793c32085d2312a5afd20937f2b2",
+                        "s" : "0x6d2b0dec0f2540ee5619fa9005c28bf889b7b7b90c3d1c2011b08f678192d341",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d510g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d510g0v0Filler.json
new file mode 100644
index 000000000..d4bf1a130
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d510g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d510g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101fe6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x45d0ad4f0a37a98f9c3af43022139f140608e2d915c672af699a683f0457cd64",
+                        "s" : "0x36bd15bc0e18401f6d07db2b22d80589e559abd50f3e5fa1fd3747dd1574c10e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d511g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d511g0v0Filler.json
new file mode 100644
index 000000000..187cc1b5a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d511g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d511g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6101ff6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9bd4b4dfa003265597b93a7ee49e495c396091c2c5bf9e5ad557caf414fff76e",
+                        "s" : "0x58e4ebeb06868fcbbf6aed0f3b7fa92c6de6477bbcfd48a69bd245d05392332f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d512g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d512g0v0Filler.json
new file mode 100644
index 000000000..1896e8aef
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d512g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d512g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102006064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x518ef3386dac19fa31d0752a62e3544c26dd4a0d6ad5b931535eee0e75d4cace",
+                        "s" : "0x3d4e959f92b1bdb70751571fda5089115f92a96b389dc2c6b553631d37060fe4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d513g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d513g0v0Filler.json
new file mode 100644
index 000000000..2cdcbd7e5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d513g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d513g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102016064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf0185134f273cd8d1e71dd4004f0f8e51ca495d32bb14b354c2520a4b62371eb",
+                        "s" : "0x26c69f26e1c302cba59ecfdf0f6bb6afcaa0b92803d010483599d107eda3de1f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d514g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d514g0v0Filler.json
new file mode 100644
index 000000000..3fc305439
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d514g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d514g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102026064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7a7735c50c3319c58a306426b271e1b4d8635c1c52d28b2e598a9b3d7a672357",
+                        "s" : "0x4b4c5b51dcfb2804e60409e57134747f344b6f746a0036b8608b774bfd0deafe",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d515g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d515g0v0Filler.json
new file mode 100644
index 000000000..e67539a9c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d515g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d515g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102036064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc62838e7941c09d0a0465ee27330fad626c7c82c70bd27b3cd9f4ea4ddd2ad4b",
+                        "s" : "0x757125a95c35bd4b6beb158c91c7e3a948af38337b86b91b9be03c42c213114e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d516g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d516g0v0Filler.json
new file mode 100644
index 000000000..edcf07e70
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d516g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d516g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102046064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1c6272d3d8a4584ed3177bfadfca27d71ace0232e6151b53705a21f387f66621",
+                        "s" : "0x0223f508e228b42d23643d3f6756e62b91b74cf1c7d466794d51bff83da19adf",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d517g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d517g0v0Filler.json
new file mode 100644
index 000000000..38ddd04f9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d517g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d517g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102056064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3b46ea04e0013d820ea18b5e518db67575f5b8c6f64b7e7a99403343c9f1134e",
+                        "s" : "0x71794656ce2511dd429b50dacd9a8ef9100ab558504c805eb70f26f12ef3e9ad",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d518g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d518g0v0Filler.json
new file mode 100644
index 000000000..af71154a5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d518g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d518g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102066064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x65e20e6d1723031009003e54f4af426ff6f9870c2a90ef7f0dd9a2e52cf2e293",
+                        "s" : "0x6e6ffcb2dc1c4119a329e7a14c8792c4cea3d42e1649539797e7838db5b7f96b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d519g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d519g0v0Filler.json
new file mode 100644
index 000000000..ed8312d94
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d519g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d519g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102076064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6cf1569a36defb384192605041eab842c92afd13ffa5a61c20ec14ed30ed31b5",
+                        "s" : "0x2d0631a30cf605a2e51a2b2f0c111d7a1be7ecf83f4b28fb8182bb57c33c748d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d51g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d51g0v0Filler.json
new file mode 100644
index 000000000..39046fb40
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d51g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d51g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60336064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x99a5fada5f1fb8133bcdf970b3f3514d9e194a3bdbfa47f68c78bf87bb761ed0",
+                        "s" : "0x4d2a89cda88a5197a62bab66fde57300b656463f381e4cd54e9784ef8ccc1da3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d520g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d520g0v0Filler.json
new file mode 100644
index 000000000..02e02f619
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d520g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d520g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102086064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x63d38fee552b365dbbdb062f41a007dbade8f6b86841d72920fdf9494d95de14",
+                        "s" : "0x7a9c10f0211214ac4b5418b30769ff51e09762ef5dd8a3c5a814e364c08ca8ca",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d521g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d521g0v0Filler.json
new file mode 100644
index 000000000..645680e1a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d521g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d521g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102096064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x135e2e94c5040203dc755e0404297c08d9f004f01d58acbdb042ce0554ba2610",
+                        "s" : "0x4e77aad6a1f7020034b3cf0dbeb78ebc7a0f8654a3e7c796281dfb1d8c3464a6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d522g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d522g0v0Filler.json
new file mode 100644
index 000000000..eb82466fb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d522g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d522g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61020a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x62c15fb6f7a55494d406cd46fa70151a03f732e1ef84754f35ace50f5aecbb14",
+                        "s" : "0x52030c5223b4fe6bb715877c24c6a7abd20b585b8e6b73812ed143a0e205c049",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d523g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d523g0v0Filler.json
new file mode 100644
index 000000000..5bcc85059
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d523g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d523g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61020b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x42dbecdb3d94d9e4e7234ce8179d45bd62b360297e3fea899a498e57e13eb54d",
+                        "s" : "0x3af1a00ba0d70b13b4a523f19a93c8d3d593106f178ec4511588be71d896805a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d524g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d524g0v0Filler.json
new file mode 100644
index 000000000..97a079573
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d524g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d524g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61020c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7e0e85b63c90b342051b24054e050e7bbd0e07a46cf8e5c30a2360e2b27181af",
+                        "s" : "0x3e826e946a3ff358c755bd6444d3dfb694d8483ad1fb7126d187efccfa90f512",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d525g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d525g0v0Filler.json
new file mode 100644
index 000000000..1fa5ab18d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d525g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d525g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61020d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x25c76ad243428eea6d14fb65f464d35121b9b91b3b68cb19d92eddaead5c4360",
+                        "s" : "0x136b45a304bd253ac9b69200a293bf0537a2181a9807a57d77df13df7fdd223c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d526g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d526g0v0Filler.json
new file mode 100644
index 000000000..7fbea1828
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d526g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d526g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61020e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa4d87a22f30a5b8a92e721df38d88cf2d5462b2be161621576e1b0ef59d46537",
+                        "s" : "0x642fc80205ed52ef9fc0032884533a14784533d0ad1028d8f761c10169e41beb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d527g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d527g0v0Filler.json
new file mode 100644
index 000000000..82dd61a25
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d527g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d527g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61020f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaa7de4c2642c46d082d4944d04949f0ec6f3762f34421e56173714c2df463cd7",
+                        "s" : "0x15bcfdafb2d0e57c93651cc87ca6be72db678848862dba5b5cf8ecca51a74861",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d528g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d528g0v0Filler.json
new file mode 100644
index 000000000..9971b5c55
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d528g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d528g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102106064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0c2d57a3b43edd5375681221a32ea2d7e43d41193a27f70eb91917e2e2890b72",
+                        "s" : "0x62188f774d48fdf73f5b73dcb670a6e1b1934a6e3a8d025210233c8dd1b3e155",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d529g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d529g0v0Filler.json
new file mode 100644
index 000000000..dba3ac152
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d529g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d529g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102116064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdc1a6defa7093922d300c082d12485bdea2e108d1545c5ca08cda349bb8c884d",
+                        "s" : "0x6e2a84f88b9090d26cc7350d12a0b84cf6afb9a5935375955524c74f16c223a4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d52g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d52g0v0Filler.json
new file mode 100644
index 000000000..2a0f11b82
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d52g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d52g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60346064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x02378bcac04c2a3e9d2802a6b3d3a73a7cee5b29858a23c179143d16748489f9",
+                        "s" : "0x3a658aee23ec2478d1270f8619012d538ce19a42f3e154d0d998c70c00223919",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d530g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d530g0v0Filler.json
new file mode 100644
index 000000000..5d4961f6a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d530g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d530g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102126064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xda9c749928a33da2cff4625f54d3c533b0e0a5c30338bc59981c9d9376f4742d",
+                        "s" : "0x2bdb8f2a04f433ebae0e4483dd2fa5f5a158c4bf7ade682bbccc6541cceb9008",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d531g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d531g0v0Filler.json
new file mode 100644
index 000000000..74be629ff
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d531g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d531g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102136064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeb5b120561af9ae33f9ff3412c7bf61b118bfc0ac5fb2d5b7f7beeef1b167ab1",
+                        "s" : "0x54a098f1695bf9b164bb1f17a8caee12c178fe065f0a5578ff735b3bdc9823c1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d532g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d532g0v0Filler.json
new file mode 100644
index 000000000..162d4765c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d532g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d532g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102146064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbb316b9f6b73ed5ac225590da6f2ef5fee4b0df7637af0e644fcf5578ac8a9f2",
+                        "s" : "0x7d4d6d636b566ecfa51e48907e5fd330412c2d9cf75e431e77cd8c6398354cf2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d533g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d533g0v0Filler.json
new file mode 100644
index 000000000..2c4cc6bd4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d533g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d533g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102156064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4f31d2e398186cdcbba822c7ef36ecef048c1d0917f2958519d784e88e5b73f5",
+                        "s" : "0x11f3a087f6aef1953d397de57c680df669db19271dcfa74f4c255282a59d6239",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d534g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d534g0v0Filler.json
new file mode 100644
index 000000000..871a68f68
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d534g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d534g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102166064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x94c49652f2f1952556fdc3d6fe4b43fb7bc7e3eb6ef39ba875dbdaf8a0595a4f",
+                        "s" : "0x22050309600932b00c61c31089a5f3fd609d425fa08948fadba5147eadb547a5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d535g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d535g0v0Filler.json
new file mode 100644
index 000000000..c0aab2edd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d535g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d535g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102176064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa5287613b4cead048d7a4b52aa61a9ded1dc75964ca71c3d31df288c5609e5bb",
+                        "s" : "0x1005c4ec3488d6a3f48303c3a419282d76bc8595268ea53174ad7b7fb683632f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d536g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d536g0v0Filler.json
new file mode 100644
index 000000000..69ec703be
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d536g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d536g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102186064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd32e5ec1a3a53fa45db4cfb0dce839f4ab5e574596dbb5896318a72d566945ce",
+                        "s" : "0x5b766b03386b461304369ff9a72394c52fe525dfb7bde48992e2996348d97486",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d537g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d537g0v0Filler.json
new file mode 100644
index 000000000..80e49f67a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d537g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d537g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102196064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x46eb1d4fd45432e8791cc21be5f8ec5d07176edbc8c0abcbedea522263006917",
+                        "s" : "0x1dcf294d78fe52c68727b36bb5eb36a7a1f67dedb06525d626ccc4eb2de1f30a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d538g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d538g0v0Filler.json
new file mode 100644
index 000000000..296f25d47
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d538g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d538g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61021a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xec1808b5c9f59819f703c7cd429eeca90f83ad3ed0b7f371e3974e35a055db13",
+                        "s" : "0x7641282d4058f0b5a4e108d7e66b268c5a02ed2f7246bce681da007792ffd16e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d539g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d539g0v0Filler.json
new file mode 100644
index 000000000..c957a0706
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d539g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d539g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61021b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6a9c6ae8521daca3c721e77058c1583bc40377ad2f3bb27727b18bd68c29c41b",
+                        "s" : "0x33d8e666748424044142d8619b93b11076137362f07b59c930ebd3fdab93a24e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d53g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d53g0v0Filler.json
new file mode 100644
index 000000000..fa0746e25
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d53g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d53g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60356064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb0bc7c74dc016ba02d9373c23d646381e89e701383903794cc7ccf95b035f044",
+                        "s" : "0x0a5d7146f2459e074077a3c2d911384f73b4047779135f890815107e57b7804f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d540g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d540g0v0Filler.json
new file mode 100644
index 000000000..7cab697ab
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d540g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d540g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61021c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2ab6ae6307ffc1c7acb1b34a14c618f9bcdd68d953a89abd912fca1d18da0f66",
+                        "s" : "0x6a9524e8a80f4d08c92fb30349cefab05af045d1a383a2ff69c8d19565e19da1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d541g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d541g0v0Filler.json
new file mode 100644
index 000000000..601a67a8d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d541g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d541g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61021d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1d658e55c7138622e2a8327fa39f6e92a09b54ad52a2f51a7db80cfb6e01411a",
+                        "s" : "0x47e056da04c27e0d1f2afe9eb400bd6ac05495a63a55c885dbdff11fdef84863",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d542g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d542g0v0Filler.json
new file mode 100644
index 000000000..2559502ec
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d542g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d542g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61021e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc5d9bf4e35dc904e25b21b72287a507f5906df97781aae9289b5af2fe62777df",
+                        "s" : "0x3a98e5f4ca29fcfdb72d7355707444466df0ae5f9921727f218408f83b4277aa",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d543g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d543g0v0Filler.json
new file mode 100644
index 000000000..c5bbbba50
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d543g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d543g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61021f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x898fb756377e737fd3fe452541e720ede8c49752d6ac4234dc249f05def9831a",
+                        "s" : "0x39e29bcf6e4de8d0f4902bfdb8dbc14ef7cf521eb974b75ce78ec82c8405f726",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d544g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d544g0v0Filler.json
new file mode 100644
index 000000000..51d514396
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d544g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d544g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102206064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4649bdce77f42e5af23658643335fc5732559f35c7bf439f75caf909d72086f5",
+                        "s" : "0x0b5d295d25f1c1dd5afbb1a01e3c8b6e1cc9365170fb41b70d98b529b654808d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d545g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d545g0v0Filler.json
new file mode 100644
index 000000000..92a56d707
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d545g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d545g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102216064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeeefe219a3c876a730a471c12303720d92caec4211ff008bbd389c1e0904d1ff",
+                        "s" : "0x52be266fd0624a19be6c1b3de6e5b4507f10cfb7f50e031e1f0cebf566ec0c2b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d546g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d546g0v0Filler.json
new file mode 100644
index 000000000..2f618d281
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d546g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d546g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102226064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x820a5fba3568902a2e1ee70534dde6998d7ce042f64db996a3a9e4a052e6a425",
+                        "s" : "0x6d5a8c33ce9b904d28ed7484b223e6e9d364897a26735b4c6bf24819371d3b16",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d547g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d547g0v0Filler.json
new file mode 100644
index 000000000..b2a33f4d9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d547g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d547g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102236064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6f8d2263b5ccec2113f3fca07124f632afa14d1421ba4acfd49d07d3f74a55f9",
+                        "s" : "0x3305caf783a1988263333178ad2be472881e00c8cf0a4607d32c60ac596c1968",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d548g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d548g0v0Filler.json
new file mode 100644
index 000000000..2ca532743
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d548g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d548g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102246064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7d6fcf9bab1869fae63194bb62ceedc4b1c97e45a920037836db11b041c55dc6",
+                        "s" : "0x61e091defcebc6557ca499b2feb66425ef1a8926ca0ce94d373efdd9fe59ebc3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d549g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d549g0v0Filler.json
new file mode 100644
index 000000000..a944cf6fe
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d549g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d549g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102256064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbde01f14a4085fc7552af65c1deccdafe782289a910ec29040ce9b13a95aa5d2",
+                        "s" : "0x2384bd6ba87189d61eefb53908e18a17a55a758496eeff695438304c86df6db1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d54g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d54g0v0Filler.json
new file mode 100644
index 000000000..1fbd51981
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d54g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d54g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60366064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9a2e76d0dfffaf89eda6d9c62eeb794b7648cf20a6002e164e95fd9800e3ce49",
+                        "s" : "0x79d779839e85eb4184c4bef93e5b643b05c3bdf0c8af475e01642065c7ea4796",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d550g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d550g0v0Filler.json
new file mode 100644
index 000000000..7d4ad045f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d550g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d550g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102266064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb5089c96adcc806bd1d1469415aa2aae63ea8e4117152d20c0ade5f4a8a216ab",
+                        "s" : "0x770e57c8f5f55bde87e5afef129355c2f13132905f05d1465efa01e4ed6806c7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d551g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d551g0v0Filler.json
new file mode 100644
index 000000000..4596932a3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d551g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d551g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102276064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x351cfd44596682fcc79de663a793841c5fe3059fcb0a515c4123bce0e704cb48",
+                        "s" : "0x7fd541a0d1a7eabe775cbc752ee3eba03aff0bc2127b7aad300ddd19151e7004",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d552g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d552g0v0Filler.json
new file mode 100644
index 000000000..54472bc9e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d552g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d552g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102286064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1ee930db10f061222c7920c76703028b65efa4795017ac33c99ee0b5392ca581",
+                        "s" : "0x32f2f612c54d441450173555d31395112451bde9a3dfe65a6bfbd0d4be6cefd6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d553g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d553g0v0Filler.json
new file mode 100644
index 000000000..fb505978d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d553g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d553g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102296064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x384c77b22d2bfbab4a20026b7186c9728c3cead0d0a72d9d61f9bc287859fd95",
+                        "s" : "0x09e88e0cdb24dbafb3d9b45c6d5222564b8346ff90b4124b2e2c82f0d34d5bbe",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d554g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d554g0v0Filler.json
new file mode 100644
index 000000000..2193c07a6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d554g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d554g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61022a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x57f27ab72b4ba52549839b92e15c48283d1a78e4bc47645c3c95c222b7d4e797",
+                        "s" : "0x66007901bb04d677b0b84e6543f4b5bed3fc39a1c677a6a9937e3158fed9e190",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d555g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d555g0v0Filler.json
new file mode 100644
index 000000000..c3197fe23
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d555g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d555g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61022b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3b20789c10b60b4b98b1c1cc8f124f854381e12e3ff59fc182edd020143ee104",
+                        "s" : "0x543edacdff4adc9cc4a03ae089e67d31e163fab73e6163e00a76187c4e6475d6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d556g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d556g0v0Filler.json
new file mode 100644
index 000000000..641580c3d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d556g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d556g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61022c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2b1c94c390808771670748008d434d257274f199adb556e1cfdb3be242e13c",
+                        "s" : "0x67180ec5fbf53d7952bd8c98def947f939fea7cce23406cfea76a127c69e3818",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d557g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d557g0v0Filler.json
new file mode 100644
index 000000000..e3dc2a0f9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d557g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d557g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61022d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x91761a718a56451cfbb541a15967feab0f9b73c2911e500dac0fd01b905ad4a0",
+                        "s" : "0x08626df3afbaecc787288eb9a8c259b76e467090721ef591e8965e97969e7b72",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d558g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d558g0v0Filler.json
new file mode 100644
index 000000000..c43630c8e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d558g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d558g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61022e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdad438297b29fd18bf7b5af566ffc66a74c0af04b0ea3a8df083e957557262d3",
+                        "s" : "0x25e1eb1c3ff4462e6d9d956ac5f1412497d02c1da17968ea0035c9e7aeb557b4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d559g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d559g0v0Filler.json
new file mode 100644
index 000000000..96647f6a7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d559g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d559g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61022f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd5b53ca45df6c34401467020e15f6fe3e33fdc6a0e757cfd92e1e7ba591a8259",
+                        "s" : "0x6dec5da7e0f44e19e4f9d56da1fd86b7fd3dd077a8e528257d8b5835d13ea0e8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d55g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d55g0v0Filler.json
new file mode 100644
index 000000000..d355fc004
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d55g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d55g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60376064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0a0f061c60cc31060e077aea95bac7faa9f3aed08b525e0a21d4efa4236debaf",
+                        "s" : "0x2a22bb1cdd70ab3615e6e053f8e5b49e054d0f4bb5f9d71b654c5469642d030e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d560g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d560g0v0Filler.json
new file mode 100644
index 000000000..c0edba00a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d560g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d560g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102306064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6d330c9cecc0d803e48887722e3798d19ee93a5ff45885693cc237a0e05e3ec0",
+                        "s" : "0x07da9aacf6568cd06b4d550669d1f3aa6ae2a79164663e553508b8c780566867",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d561g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d561g0v0Filler.json
new file mode 100644
index 000000000..36fdb8d58
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d561g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d561g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102316064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2e2d926ee66e5798c900a4c1761769d2174956f4b9016cd9d075662b77bce896",
+                        "s" : "0x765e169e37bc4dd1adc52f7bce48f3cad7543d259fddacf87eac7dcfbfac34f3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d562g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d562g0v0Filler.json
new file mode 100644
index 000000000..95311e350
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d562g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d562g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102326064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe97bd5779cf83d351c8a943f797d6d915fee62577c46aa6fba53b4394b0d70a3",
+                        "s" : "0x566d96fa606865de026dee1e165f2ec1949c89ec98fe524d5bb5bcb4f2ce4bc9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d563g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d563g0v0Filler.json
new file mode 100644
index 000000000..b1bb91e9b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d563g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d563g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102336064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd5bd31bd3e12f3da495988f9c180ce7062f54fab0f1badcfb1b949af916dcc77",
+                        "s" : "0x2af40426045195b0054f965963572110d4dea4cb43f31641fcaccd398b34135b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d564g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d564g0v0Filler.json
new file mode 100644
index 000000000..a2a4d19c0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d564g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d564g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102346064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaa53ff21d62a6e978d785c0d81b56592bd32880cbf77fd15222c738e6c889659",
+                        "s" : "0x44007554fc8634c2c8193b8e00b440406de93c3eaaa856c7bc619e8c642feb74",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d565g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d565g0v0Filler.json
new file mode 100644
index 000000000..89f6c9614
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d565g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d565g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102356064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeec8b53d220e9cb8b70c25be669af051a5dbb5ba89611447970c54a93a795789",
+                        "s" : "0x176475bc3ef09f9ce11397dc016c6fea3ac7ff3ef762e0263227ba06f7dc0d66",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d566g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d566g0v0Filler.json
new file mode 100644
index 000000000..5fdc81906
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d566g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d566g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102366064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfafa6ec174130d409178d828701f9d4fff299ab15fa2347e524896c118ff1ce3",
+                        "s" : "0x66eb577c2b3ee3475bd356ddb7d000ebfd63b715c9626b681e2179811dc0c303",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d567g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d567g0v0Filler.json
new file mode 100644
index 000000000..53f5267bb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d567g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d567g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102376064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x514d6185094afb82744dba4f5840e432d50992da11dde0906da9e3ea4acf9d52",
+                        "s" : "0x3ab85475d3508f94c2b506244bfba3505baa1917b53f75eb42965caa3a73bfbf",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d568g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d568g0v0Filler.json
new file mode 100644
index 000000000..d7a0a8744
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d568g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d568g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102386064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3a5d36a253b892974480ec44ce17995a2305eb6dfabb2d73ab24526bc2078250",
+                        "s" : "0x154330988ba85cb6b6e7ada8db40c568d52a5ac224d82735993dde28bba10e53",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d569g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d569g0v0Filler.json
new file mode 100644
index 000000000..f75a1b596
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d569g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d569g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102396064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8512139e83e20b36a2b5ec94d7079f1a731f56981513e8e02c71fe3b45746e7b",
+                        "s" : "0x36ca7d047054ac5dcab79e0737879ab4eed34365f7e34b76f3dc2f81b15127bf",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d56g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d56g0v0Filler.json
new file mode 100644
index 000000000..cdcfda6c3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d56g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d56g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60386064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4d6a5dd1af5ae90f02dcc198e2af9a423cff27129bcbc891d185ff3dcd48a4c0",
+                        "s" : "0xb2d012f564bd827550a815b7fa274d07c3161f0e14e9afed7b410fa31bab97",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d570g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d570g0v0Filler.json
new file mode 100644
index 000000000..c068b7f46
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d570g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d570g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61023a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfbd625f199cc6f295d404e504e1bbfff03311c4786a866525ab76a9d0c2170b0",
+                        "s" : "0x658502f481d150e0154f6a9d19bb760efd0873b95a72168f55ffb84cb47b92ec",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d571g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d571g0v0Filler.json
new file mode 100644
index 000000000..f2692d95a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d571g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d571g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61023b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x54a37438108222e0448252b8b3e560e69b86310d871eb88328f055fb2beb0256",
+                        "s" : "0x5d0961095f0700b8be4b2e24a4d908318e1979a5562a168f928f8cb4eca6730b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d572g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d572g0v0Filler.json
new file mode 100644
index 000000000..200a656ab
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d572g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d572g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61023c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfc78229f6becf825f9048411b875d316e18d7a274e5d26d4f32ec90f8aa4a768",
+                        "s" : "0x550018b2150c3367438ea268e1f40889128c2339642f814b14f6520853b2891c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d573g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d573g0v0Filler.json
new file mode 100644
index 000000000..55bd2fd16
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d573g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d573g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61023d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x417241026d61e3e5a0cf3322b2d63cfe156eb038f39a1da37c1da7a57ab307f1",
+                        "s" : "0x081b261f91458d8db3fde7202dcf56095fe82271001c9d4f8fa35274221cbcb7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d574g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d574g0v0Filler.json
new file mode 100644
index 000000000..96f62594a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d574g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d574g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61023e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3357b24748b4187297603538861e04310012efcb3b4d8b718cc2036f39e4ecc5",
+                        "s" : "0x655db2bdec4fa2f99669837caf6d40df52d9eaa21e7fa31561fbe203ca7d35c7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d575g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d575g0v0Filler.json
new file mode 100644
index 000000000..4412cc526
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d575g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d575g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61023f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6934f002dc1b5e1d3a56c36c46533cc4311f5dfe9022f7dbc1f3dc8ad5cc1bc1",
+                        "s" : "0x638de1f42d4cd2ecfbac0fae535c20fb7e22074bdec3c482490f197eebb1017f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d576g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d576g0v0Filler.json
new file mode 100644
index 000000000..780db61be
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d576g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d576g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102406064526000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa50600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9fbbc0842457a213846bbf87baadbc434ba03e4228ef7a38dd5d6b6f6a87a591",
+                        "s" : "0x1588ae1c907670429e81f821edd22761ea6cb07b11f604828d2932bdaa9349f2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d577g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d577g0v0Filler.json
new file mode 100644
index 000000000..7f56750e4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d577g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d577g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102416064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x323b5f849aa70e2043bd232dd4b398d42fd5bc9a51545ee42e5ecb5dea1cf084",
+                        "s" : "0x5617ee6c9f1066c1ec6c4039b3d6acac764228be500c9cf0f7a4c0f5dd360ae1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d578g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d578g0v0Filler.json
new file mode 100644
index 000000000..033d41743
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d578g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d578g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102426064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x28e33ac649d22c20ec8f60230374ee0faf2a88a15c52fbeda07b6745cb37cd8d",
+                        "s" : "0x50dacd256b10f5528d846bfccfdf7df8d0b089eb34d2df6ccb6e369e93834121",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d579g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d579g0v0Filler.json
new file mode 100644
index 000000000..2f2b47ca1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d579g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d579g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102436064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6346fc5181bd922317c97ace0a23189d1a3b62c37be52afc4dcd75c15201663b",
+                        "s" : "0x193e95c2806f9e4faab03be10ef57f7c37ec9696bd557362d27fdd7cc486db2a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d57g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d57g0v0Filler.json
new file mode 100644
index 000000000..f2911ece2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d57g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d57g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60396064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3f066ddee972091189fb1f7ac62a9a1eadce2dc61c2470c5d99f93c8223c5ef5",
+                        "s" : "0x2ae43d5935e9f6b9478379d489690ae4a19c6dae13a7797631deb39aec4aea2b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d580g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d580g0v0Filler.json
new file mode 100644
index 000000000..eca319d31
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d580g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d580g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102446064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf1ffc7f00754a0900a91b5b71d6de3ca572333bd42d7a73f78366bcd2662f28d",
+                        "s" : "0x01de33bee9bc4738922233a81c27462ba196a36ac622eed9923f2f59d854c300",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d581g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d581g0v0Filler.json
new file mode 100644
index 000000000..cb210e5a9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d581g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d581g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102456064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x286ab2da7553347f440cd258db5d516d3a4c07dc2ab6bb3e4a63564e0e6f2047",
+                        "s" : "0x2e838f822f892f103ac627550d66bb84af33aa6afc2b5a00a91a2c7d1174cc7f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d582g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d582g0v0Filler.json
new file mode 100644
index 000000000..a879d65b9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d582g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d582g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102466064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe7f2da6449a02ca1034bcd343dccf9efbb2d5d90fbe2a98512f9ac1c2e9fcf26",
+                        "s" : "0x2f232e97a4aeeb318f84e385c16f72d8b2fff632b0a11c6a21c7c023638d8e7b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d583g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d583g0v0Filler.json
new file mode 100644
index 000000000..8dba7474e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d583g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d583g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102476064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x748052649004c6382c18c600e3e2b42a71b29fcba64618db00fafa54fb497335",
+                        "s" : "0x26e5e3822f6e88fc6394bb57bdb408ad8341c8d6fa40341ecec85f87678c7a2e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d584g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d584g0v0Filler.json
new file mode 100644
index 000000000..453ea41b5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d584g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d584g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102486064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9ea0cddbd1bee579826cddb0bd6abf482bf7e4a395aed00e2b801b4a1bcf75b0",
+                        "s" : "0x3ae6af856224e677ba13de8995e0fdd7b7358ec26fe58249ab4398767b055d6b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d585g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d585g0v0Filler.json
new file mode 100644
index 000000000..db164f2e8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d585g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d585g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102496064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x299e773e9afb78aa392789fe929a085a8f05a3aa5ab70b1cf19af3f2a486e9b3",
+                        "s" : "0x626066e1d92c47b7728d0d62a2b4c2207586688de5e3f480edb274661bd379e6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d586g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d586g0v0Filler.json
new file mode 100644
index 000000000..9bfa052a9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d586g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d586g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61024a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x096d72d7b81528351ac88c3df326e360690d2a13bcba5848b148d1156b1e55ec",
+                        "s" : "0x53aefd20ae63f77ad3221fdc334274f932271d027bdef2106a79eb7bfe3b673c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d587g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d587g0v0Filler.json
new file mode 100644
index 000000000..46c531776
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d587g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d587g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61024b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa153689b066ccfefce3a6d303ac760f15f6da1169beccc73e417831970ef85a1",
+                        "s" : "0x2459f5b670bb0bca657c857e3ad5c27d2e3b9a21640bb8cae6955ac6d2c6739f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d588g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d588g0v0Filler.json
new file mode 100644
index 000000000..c975f08d0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d588g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d588g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61024c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x194b27b3b244094970e329c17707b9a94680c8f05afa964d4e1dcf7701d8bcde",
+                        "s" : "0x612f43bea9249b20860ba9de8ad41d7b9c6951792d47f24c8a05ef195bedc16a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d589g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d589g0v0Filler.json
new file mode 100644
index 000000000..a11382b57
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d589g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d589g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61024d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6e9b1151fd581af1d4265cdb22638afd550f5e87c69205bf9c26129bed38e770",
+                        "s" : "0x4dbabdb685cbc71aeefe0e2099baac093f8949bc64f0299ce6b6494160ef836a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d58g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d58g0v0Filler.json
new file mode 100644
index 000000000..4e98789f6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d58g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d58g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x603a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x70d350c47735d4df636c6fd3f03b56f0f46b2bfaddf06acca8f747101d2b21ad",
+                        "s" : "0x11c19901a9761ffc2e66f132b56f7ed13d1df1a11683fac39ded234819c666c1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d590g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d590g0v0Filler.json
new file mode 100644
index 000000000..08351ff59
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d590g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d590g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61024e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x69256c700c7f37fad7dc75fa8d69db20fc3e1fc18f7bbe37bcc6b69502d13cea",
+                        "s" : "0x253b9ace5201b79a3469cd559f8dab6b3969c43afdd36c8cbd11cef11459b053",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d591g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d591g0v0Filler.json
new file mode 100644
index 000000000..000433094
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d591g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d591g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61024f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa725322296390eb8dc309f14fa9fafc25030540150107063e200b4ad47647d8f",
+                        "s" : "0x6a54c4f892d0a548643ddf23d0969229d363eb0c8d29e242878a74edbd1f7e39",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d592g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d592g0v0Filler.json
new file mode 100644
index 000000000..c5e7526b0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d592g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d592g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102506064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdfa31b89d0f6e0c70b8ebc86a0a35d2e19d984a39a58de0724b279aa8f50f2c8",
+                        "s" : "0x0305cc6fc44b2c1dd11f07c11a3f53200e62b78f95e81b146afccfe977c4c512",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d593g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d593g0v0Filler.json
new file mode 100644
index 000000000..2b4756bf9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d593g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d593g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102516064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2e0af79ee67d9c0eb8bba55b358d8dc82f3532e7b434f4e4c16dcaff98ab8b2c",
+                        "s" : "0x4752ceaef8026c980828809fb6d2833f24154df9958c7b6273dbd7b9784978b7",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d594g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d594g0v0Filler.json
new file mode 100644
index 000000000..0055afa66
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d594g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d594g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102526064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4349f208e9ca89cb120abb91279836f735ac89b530ea6de875381ec0d05585dd",
+                        "s" : "0x33f87c2de8756b842765e0c4093dd30a8de8dc25a1ce0861f38622c5bc92967c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d595g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d595g0v0Filler.json
new file mode 100644
index 000000000..0d180ed23
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d595g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d595g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102536064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7313d9b22e56a09cfa069cfbc74266c611df8d29ff28011f5f52b17bac877b58",
+                        "s" : "0x0e3f74361f428803d44d820d08d3bece9770539715f863f398304b895eddb67e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d596g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d596g0v0Filler.json
new file mode 100644
index 000000000..87b9bdd93
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d596g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d596g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102546064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa9cdbc1524f0e550778cbbfcd2fce0d65ff991394f5381b6fb77d357f2a9f689",
+                        "s" : "0x0e5f6ec4c1341dda31cbecb3d14ad711a23a96f6b732840b24cbe33e26e98a9f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d597g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d597g0v0Filler.json
new file mode 100644
index 000000000..a91c9a99b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d597g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d597g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102556064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeb805efa94804d7bc6dc9e24f39cf90f7a5c5c818168a4b18f92633de612b4e8",
+                        "s" : "0x1710449b6094a9badae19bce70fd95cb2f095e3d863fc7fdb073f87cd1c988c3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d598g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d598g0v0Filler.json
new file mode 100644
index 000000000..14d4c24f7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d598g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d598g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102566064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x72f545938c8f8d45d024dd92069405e106a0b3a645e9fcd21c5b4946a5016aa4",
+                        "s" : "0x0ac255ae9b3e6ced604a21b0e495989605a8d05eb7310db029e40e87980f48db",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d599g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d599g0v0Filler.json
new file mode 100644
index 000000000..60b1408ae
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d599g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d599g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102576064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6613dab03faccc60a0f6df3ce3382da6b60ef3b09ae08696a0baa8178cfeffc6",
+                        "s" : "0x4b5850d5c34d54de2bc30ccd754ff2439c0707649373e7665fd3d897853b4d48",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d59g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d59g0v0Filler.json
new file mode 100644
index 000000000..112407b6e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d59g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d59g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x603b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x49e32bc8fdb99f0e654b5f66daa87fc9c7464792fc1dc002d76bb12ff82ca678",
+                        "s" : "0x6c71bf8f0c3e7563fef90f5010e5a5a1ed296d63ccd0e60fa72748f788140c20",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d5g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d5g0v0Filler.json
new file mode 100644
index 000000000..fdeb9a5ea
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d5g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d5g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60056064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4456ae4edc1677663353a403e192303a5498cfff1f0acc82b1aaebcb49cb129a",
+                        "s" : "0x19f2aeed2dd50a24962e6ce867e8c2e68dd34a043cf15cfffc498f9508c5a06c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d600g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d600g0v0Filler.json
new file mode 100644
index 000000000..aa3cd05bf
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d600g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d600g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102586064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x99899b6588df3f8966a6c18f1cd8ffa9680fc63ddeee1d6e373cda2f78ec0ccd",
+                        "s" : "0x6af68416904fd5b81dad92ae0a6a84830eff5286317c6049c4e04d5a2ba4533e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d601g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d601g0v0Filler.json
new file mode 100644
index 000000000..eb0d6b8fa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d601g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d601g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102596064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf8a1cb6063890bb24c3fd2f1d439a14ff63e04aab50e01bfea45e5998e1dcb5d",
+                        "s" : "0x5b65084bc4e816c5b2563ca9199cfd58a29b89697e35174730facbebe378c9aa",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d602g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d602g0v0Filler.json
new file mode 100644
index 000000000..787d6bfca
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d602g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d602g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61025a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7f40a51ea8fc464fb25e690006d35af07259b249dd6e57a581272fb7b1c09341",
+                        "s" : "0x0a8b6d9b1663f05b837033439bdb6b01af7326350adc7b573d2a575a3d7a3f79",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d603g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d603g0v0Filler.json
new file mode 100644
index 000000000..ecd48643c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d603g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d603g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61025b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd76e5abe9ca5c82ac03d1d6de6790e792e7dead9a25fe09dbbc9636edec8619e",
+                        "s" : "0x3ca69f8fc2e58cbf4ebe63ad73242b1fb0f8a8c4482a964d3a0c2f1dcea5a119",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d604g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d604g0v0Filler.json
new file mode 100644
index 000000000..4c7fbb504
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d604g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d604g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61025c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x947a2050102962a28ba4f3605cfc58b8877424b28e3fbe1bb9a6e36d8dba15fc",
+                        "s" : "0x3925d15b60a744fe4cef341ffe09eeee96b2df4baee1ef8b1f51e5e7df3cf66b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d605g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d605g0v0Filler.json
new file mode 100644
index 000000000..b7d935b67
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d605g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d605g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61025d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6312de8369062b6b8eec3f45d6fbdb4e65939854c751b79a30f1acf86c40e8bd",
+                        "s" : "0x0fe6c3c461f97ca4cc385072e16c1773c2ff74cc5746b8d959bc29cdb749baa5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d606g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d606g0v0Filler.json
new file mode 100644
index 000000000..62822b98c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d606g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d606g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61025e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb212f05f96d4cf8e87800563d1fc567d7ffeda99b62d5f2e4a05facf0b05a84b",
+                        "s" : "0x2ea25c0b2f7ac41f2f68890dc8c50da5e9a644b36e34f6078877c9f2841a31ee",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d607g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d607g0v0Filler.json
new file mode 100644
index 000000000..a4b0a14a0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d607g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d607g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61025f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1da497129d56a1a68feec17d0579aa5323bc08bdee4f8f0475d94e57143bf99c",
+                        "s" : "0x71f42c2227195ef8c3077903214d567059b3164a5452c2650a03f7aa39151be7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d608g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d608g0v0Filler.json
new file mode 100644
index 000000000..8091c9377
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d608g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d608g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102606064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb7cbb489376d08cd723d5dc90c6619c2c25552c50a802e3bc371c92bcf0b2ffd",
+                        "s" : "0x5dbe7418324a85d574cb5404720e913723ff98769d6c387fafe3ed48d0e8c592",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d609g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d609g0v0Filler.json
new file mode 100644
index 000000000..88cfe29b9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d609g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d609g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102616064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x820be0c556d157544b6a9a8435ff48291f45a8e43bda50c74e0239b34527d7ac",
+                        "s" : "0x55d8a1c17176e6a7d1b484e13b756f7b6ca24f450a8c35e7dbb9b8381c54a2c9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d60g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d60g0v0Filler.json
new file mode 100644
index 000000000..672ab2296
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d60g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d60g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x603c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2ab084c1d929fcf805835b7fd391e664fa82794e59b19250732499c3ec421edc",
+                        "s" : "0x318ff9d748eac9c7a9c8e84a34c316b4a349d38d665f3a76f74850d2d3f89f10",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d610g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d610g0v0Filler.json
new file mode 100644
index 000000000..ed9c908b0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d610g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d610g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102626064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc424d0562fe9a059ec1586e80924174ecb61a9bc1626f0a41afbf2b43e876d4e",
+                        "s" : "0x2fd2942c83459db6a5edc39aac402b24cf7bfed1e332b5ac6c51bf008e64e181",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d611g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d611g0v0Filler.json
new file mode 100644
index 000000000..323c6d477
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d611g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d611g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102636064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa4401457d18caffbb587176ed43d6a45d99e524387af9c95044156004a8e3a82",
+                        "s" : "0x487896aa0c51f5fe9f3f635b9323b78ea6eb7a16fca5135cb5ae967f8ba0c667",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d612g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d612g0v0Filler.json
new file mode 100644
index 000000000..6a9fb4d7f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d612g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d612g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102646064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9911004c72021685e0f83a6ce36ebc2de09ba6062ad76a8d7e273288fdd866db",
+                        "s" : "0x587a2892d624067f40c0f06b563b3bcbf703505c7137c1d528df0fc04837d870",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d613g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d613g0v0Filler.json
new file mode 100644
index 000000000..7f62ae54d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d613g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d613g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102656064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfc278688285ebd1743dd03a8aeb834e2a647956d33f2bad784f888474bc82e30",
+                        "s" : "0x3b112c4327dd938155315c4666c0d53585b14920a8b1ab79a55dd0e21004341a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d614g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d614g0v0Filler.json
new file mode 100644
index 000000000..2780efe7c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d614g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d614g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102666064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x241efdfcb674b11b38c88af42c5b15212eea3f81020745788b866e441a49c35b",
+                        "s" : "0x5a6095ddfe4ab6cc4c00f19382ad92de88a3f8c7e73db2754b47be9a59003a1c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d615g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d615g0v0Filler.json
new file mode 100644
index 000000000..01a168a95
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d615g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d615g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102676064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x442ed17f3df89922e9b8dbc5a14a615b00c9738dcaad05995332a3e82822d51b",
+                        "s" : "0x6d897fafd3ff5411b1550ea8cd46f4ab8f7c43ea3835233408de0e82c6f80805",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d616g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d616g0v0Filler.json
new file mode 100644
index 000000000..132e700e0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d616g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d616g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102686064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x494a993a74b4b3833d3b02fad81aa58c6c11f21fe39c6fa3e9beabc142f7f427",
+                        "s" : "0x396ea18d2aab9c056a5f3db6f9fb6b3a3fe936981a552904d54b58498175aee9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d617g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d617g0v0Filler.json
new file mode 100644
index 000000000..8660a7224
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d617g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d617g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102696064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7b74c2d035afdf56f8451cc3d637111a75c1f21e00a4c60e580844c064359ddf",
+                        "s" : "0x3343771f26d3ef49b824d9b06e9fd4a8b0e0dc6f5cb0960357b769ffed0eb3ee",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d618g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d618g0v0Filler.json
new file mode 100644
index 000000000..20f3737c4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d618g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d618g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61026a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb9ca9a87814c0ed0b5b7a2977149881f9a8ec2d0a672cda2ad286d9c405ac957",
+                        "s" : "0x1af6e9f78086e6fe4c85d6bc52b8138a0451b8d88e759ea0356a79ed3c33f500",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d619g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d619g0v0Filler.json
new file mode 100644
index 000000000..8c92f1ea9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d619g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d619g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61026b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7de69a43f1136a1f7602fe35edde496adc9741e74929915cb64b2d414a2020e9",
+                        "s" : "0x66997587f09b1438ae4921ae51bc196805d4f406b8ecb66ef3e73083dab63a41",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d61g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d61g0v0Filler.json
new file mode 100644
index 000000000..20171fe11
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d61g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d61g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x603d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbb27eaddcb2e71d9def927dec91ffa9bbd2e60252121b279f5f91b18a6399bb5",
+                        "s" : "0x0320f0e771c6b36def758b646613144a0d278d5bafa0dbd55099046fe8d186cf",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d620g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d620g0v0Filler.json
new file mode 100644
index 000000000..d3186c18e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d620g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d620g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61026c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb1746d7322a6171b11af4c09af1172bc28b72a025e6f8cf2d587c2746ad813e5",
+                        "s" : "0x30d17294f647be4764ccadb5c8e5ba7bfd720be9dfc9351ac976b2d8b18eeb67",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d621g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d621g0v0Filler.json
new file mode 100644
index 000000000..567b6e01b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d621g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d621g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61026d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x044f29b5bdd0b973a080a25265e9945ed15c7aabfa87868e40e27eaad685fda6",
+                        "s" : "0x124f1ee7cb51168ca67fc81653c1f0c4ad4679e60f4d09ccd160b24991210657",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d622g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d622g0v0Filler.json
new file mode 100644
index 000000000..9059a9fd7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d622g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d622g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61026e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x29284520198e16a4c3eb5ae57fae0a4054aa03897ac34322ecfc793309542981",
+                        "s" : "0x3fcb543d688404fdde312489ee3191dd1b61ae35a730ff44310fa5343f0b89b5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d623g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d623g0v0Filler.json
new file mode 100644
index 000000000..c6690042d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d623g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d623g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61026f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc1ec30feb3d96d11140f1d4a6f36e2407f54d6faa152bb5d657f4da71747c508",
+                        "s" : "0x0421175cde597595574da7831ce806385e79a46c614d958c925f72e9530b5ee4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d624g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d624g0v0Filler.json
new file mode 100644
index 000000000..94b150eb5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d624g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d624g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102706064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe207c85afe0574cee1f6ab79b9e571ebe9ccfc9f300c759b83133a1c06f2ea12",
+                        "s" : "0x38fb55cef17e4a4f455beb4b2158b4a30bd559eb1553cde0f47ff26a5a63e763",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d625g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d625g0v0Filler.json
new file mode 100644
index 000000000..a7bfc6a75
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d625g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d625g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102716064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf7422b2365de859fb39e421b2d022e3aa5b946c8e34fa7eb0c3388283c927ebe",
+                        "s" : "0x51a476ab910e73381fb58223c1a0e429381844013b537c2b9a1c2ef28cdb9184",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d626g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d626g0v0Filler.json
new file mode 100644
index 000000000..68680d397
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d626g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d626g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102726064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa688d2515c3d6efd29cb840a992e358faa0ac400aecfaf39b8c6b1d15042f9ba",
+                        "s" : "0x2af4de71b5903db2e1656ac1a2349756a5d46382ed306f781c570d4f28e09e52",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d627g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d627g0v0Filler.json
new file mode 100644
index 000000000..15bb9b4d8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d627g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d627g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102736064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x092f708d05bd794242793ef3764eae54fd155600f7c504106117459550e2ff8c",
+                        "s" : "0x2b3f59e6aa16d5c53c0ef8982b75a53aa6a0c150635ab66615e1101ed9ed1051",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d628g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d628g0v0Filler.json
new file mode 100644
index 000000000..2a753fba5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d628g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d628g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102746064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8a962870f4031fa675485ba79b52dfa4032c7900b92b2bd661fa935a291054f3",
+                        "s" : "0x5342f45b6298d3e9d4282a6d60e5570f0c54d05025439311ac014d9a1542f10b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d629g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d629g0v0Filler.json
new file mode 100644
index 000000000..ab4f0da03
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d629g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d629g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102756064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd82d672cae31584714060cff01c9c87548ef4005213e3e1a404519251f46f5a6",
+                        "s" : "0x2a89a1373382da8c5ad8c4d31b0614f54d968066e82b41d30d825098d30594f1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d62g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d62g0v0Filler.json
new file mode 100644
index 000000000..0fd1dfc01
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d62g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d62g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x603e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5a93d9eceddd18f3bd5dcae5f23bbafb323e8b7a0df59f579bcda7c58d916875",
+                        "s" : "0x7cf181691df682ce70b9feb803a2f563a2887a009f57f54879e410a8b604462b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d630g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d630g0v0Filler.json
new file mode 100644
index 000000000..d8aeff197
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d630g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d630g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102766064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xda8ebec8be18b3b98ba9a967ca989d5b7175bdd61b05417d8fd79ab66c3e8ab1",
+                        "s" : "0x46690b6fe5e1583b6a27989571234132f3cb59e4744229e5b74e2268a1002221",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d631g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d631g0v0Filler.json
new file mode 100644
index 000000000..ede00e033
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d631g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d631g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102776064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb0bc6809300d355f9465d3676b2b3ad97c3c935b8ed19a7fced75ddc1e59e3a4",
+                        "s" : "0x6772131b83f38fa4705a2a6a3e49fc1f670a66bf4ed3fdc483ae6e798602402a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d632g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d632g0v0Filler.json
new file mode 100644
index 000000000..b570b3144
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d632g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d632g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102786064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xac69139e8551b1189c7590f7d69c1cfb6d41349531e6aba2fcfe99e0d19149a1",
+                        "s" : "0x10833bd77150a7b93bd181bca585b012e9ee60bae0b42fbd30c1fcee1c414547",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d633g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d633g0v0Filler.json
new file mode 100644
index 000000000..655e42fe1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d633g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d633g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102796064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3d3b2b5776fd099a1b77657b0ab9010b593971e655f6b6f7ceb2db4f7089266e",
+                        "s" : "0x5f5541acb2e1fd84f1c382f7f832aec0586ae86c51130de8a0237d7df0e7f696",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d634g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d634g0v0Filler.json
new file mode 100644
index 000000000..27a4e8667
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d634g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d634g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61027a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc733e1b94ae7a5a017ee05ad927ab436ed3112d7a808cedd685d9f22c7070ec2",
+                        "s" : "0x172d3ab23af7a0718a99d97b6957c49de228b1cd3d853fc7e758108ecae77c9d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d635g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d635g0v0Filler.json
new file mode 100644
index 000000000..b7d2bd268
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d635g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d635g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61027b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbbd500d691ea6cf8f80d8c255c1ced5c85acea3c3b780288a88708bd9c9b17c7",
+                        "s" : "0x20c5d7741119d2f75a2589a4f7b6593d5d430f95cc7ee0cfc178534aad024d05",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d636g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d636g0v0Filler.json
new file mode 100644
index 000000000..bb60c55c9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d636g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d636g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61027c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3a997057b8799ae1f6ede1016b51d5f68ac2c6d6a4b9a6dceaf0a722283d136b",
+                        "s" : "0x316daf31617b5fca7c0fc7d3b974d6c30fad74da1f0f21186db6fc3c09a0ff59",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d637g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d637g0v0Filler.json
new file mode 100644
index 000000000..0ab173e95
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d637g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d637g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61027d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4e3f2558586fa60b2bdd66d432a9859bf5c4dd1411ef31b5e525ccb56b4566db",
+                        "s" : "0x7270465e15b4ef3a18604cfaff7403e1fabdbbbdb11978dfa6d62646c4fd6289",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d638g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d638g0v0Filler.json
new file mode 100644
index 000000000..37938d9d8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d638g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d638g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61027e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x98f7c1db0493b44bb1a6b39050c6a09d4c00415dabf5827271160c1d3f32f9c5",
+                        "s" : "0x2ea7bcfd07ffc5e9f84f8c011805423869d2001c071d070834974ac29692a8c8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d639g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d639g0v0Filler.json
new file mode 100644
index 000000000..9793d88a4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d639g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d639g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61027f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbee6346cc09f1e928ac31e81a941f75a6a2b0fd2782534971a742eb4fb4f6482",
+                        "s" : "0x203b2133c999a1e81f820d679e12c4a5c524640de6abca46d8a1810d80862814",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d63g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d63g0v0Filler.json
new file mode 100644
index 000000000..d4ee8e959
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d63g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d63g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x603f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x40d11056a25de2cd40cb98d7f7831058108fa21f3b07cc93f3617cab65b5f632",
+                        "s" : "0x7797081934bbabc4d2482119b0744abf1392c68023d98ce6f1af860ca8a1bdac",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d640g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d640g0v0Filler.json
new file mode 100644
index 000000000..4398ca354
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d640g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d640g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102806064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5f951b1c4f7f770777bd267ee8d4c1bc3759cc70a16887a995bb9f53067dc85f",
+                        "s" : "0x1bd7b0a932c9b6c8005898c71a3a581ae7e36b4c50fbe7e2b3c15286d59c70d0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d641g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d641g0v0Filler.json
new file mode 100644
index 000000000..ef8b0a294
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d641g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d641g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102816064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc768fd04328d52c42d58168a5bf484d626eec8642592ee63ce060e51115b650f",
+                        "s" : "0x3a2d1a2205478983219c4917e215da106881211bedd32b95e087169ed7b09aa6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d642g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d642g0v0Filler.json
new file mode 100644
index 000000000..eecd7d967
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d642g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d642g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102826064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2742881832a207e46d267dee85e20b9ca7361f18b8fbce509a4d15258498b46c",
+                        "s" : "0x3857ed30d8ea26f3107438e16e9c938e18f7890af80c35192bd211c5f36e1e81",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d643g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d643g0v0Filler.json
new file mode 100644
index 000000000..123f21a6b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d643g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d643g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102836064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb27cabd99f929aef27d27655f2a33d92c698de2dc86332738e59cfa1e32a27a8",
+                        "s" : "0x0b9d107a585b25efbf37cab2a1733e74b34e3ee4b59c345187dce8bcadf12465",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d644g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d644g0v0Filler.json
new file mode 100644
index 000000000..97e30e5de
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d644g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d644g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102846064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfb4ae60689db500e4e8a3288a162cfe4ecc722b8666639c175ef778fc7226757",
+                        "s" : "0x4275db8f46ef98acf2cebc147f55001a14edac8079e44f2e745ab86f6bf5e2f6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d645g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d645g0v0Filler.json
new file mode 100644
index 000000000..a37bcf0a0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d645g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d645g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102856064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2a460811c7ed4f0479e6f3f1f5dd1f450028ae665fb22564b0bb526892753fe6",
+                        "s" : "0x413f60ac362e575ac65aa4439ce8d1bf76f068ccf745952e34fce2f45be216e0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d646g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d646g0v0Filler.json
new file mode 100644
index 000000000..9d63552c1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d646g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d646g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102866064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb0d06c0045e250291889265ae1f10d8d389b5fb566cf6fd83027a4a6712436b3",
+                        "s" : "0x36e568a21708dad75d97775acc5bfe9adc7106abc0f77c4522c7459543fc34ce",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d647g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d647g0v0Filler.json
new file mode 100644
index 000000000..2e8d14a60
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d647g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d647g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102876064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x064ab725bb2246e3a6172077b43907328cb80ed2d12ec0d7a518028499bad695",
+                        "s" : "0x061cae19036430f8d7b82039257f1b57b7c5dc1c5d71090f42d01dd8aa848697",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d648g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d648g0v0Filler.json
new file mode 100644
index 000000000..d77f42974
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d648g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d648g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102886064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8bba2d0a71fe302c3341cb23d2a1e44508ecf74da44d775649a4652bf1ddab95",
+                        "s" : "0x24fe878a3d5c93a6d7956fc92bbe6abe3b83bbc41d431c10b3c0a04b58038dc9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d649g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d649g0v0Filler.json
new file mode 100644
index 000000000..ee4b0ff99
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d649g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d649g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102896064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x909d9bf9c43f00cd2507e5e3145b2e720564c84a0bb70da0b83c24f166a54eef",
+                        "s" : "0x182b5c376db5468badc190b1ddd45448fc663f68e55ffec67b1a8dfe20112a85",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d64g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d64g0v0Filler.json
new file mode 100644
index 000000000..f5a65448a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d64g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d64g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60406064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xabfb3ff8c8dd593e1aa333705ac718b925133e58415e522368cb77bd6cd12d57",
+                        "s" : "0x7eeabb7d3f885023b8d0db01ad2adc6749d7cdc6ae2e3cb5156c4c247745ae10",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d650g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d650g0v0Filler.json
new file mode 100644
index 000000000..05a881027
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d650g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d650g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61028a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb5c81526918b5356954477c49437a77602e2372c122cc541b24f56d90140e864",
+                        "s" : "0x7d9abe08e736b66e22f59fca108db608b418361305887f2aeab86f6eec3862a9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d651g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d651g0v0Filler.json
new file mode 100644
index 000000000..6230f1ae1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d651g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d651g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61028b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe0e772bbbe21cfab7c48ae4f7b374df1b1cfc2b537d3844bc6f6bc1055a44f49",
+                        "s" : "0x43a3a469fefadf1fd3e1d6c6310f3507845d6d3cf2af47a608006d273d95916f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d652g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d652g0v0Filler.json
new file mode 100644
index 000000000..eb1093541
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d652g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d652g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61028c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4496d80821932ec4691a15e0642caa1aaed98e5a55f3a313899cb0fbed268add",
+                        "s" : "0x5d4033374c1776963373511f4ed4a4e0d4fda4d22b644694b924f53dfe15f43c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d653g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d653g0v0Filler.json
new file mode 100644
index 000000000..7233562a7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d653g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d653g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61028d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc397a0bb167746fb90de2f924a5bd4e724429dafffce1746c6f0d0eeef65aa2c",
+                        "s" : "0x21caed99d048750d946a369d0d33441332395d4e981776e9ba736def8e59814d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d654g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d654g0v0Filler.json
new file mode 100644
index 000000000..a26221379
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d654g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d654g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61028e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x47309dc4877da07bc1f754a9ee1529b9a322341c51289caf088a4642089b7e4d",
+                        "s" : "0x6bc7be4aec74fd381cf45e9dfd50a1b8f285cce947a38799c917b71e450ce2da",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d655g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d655g0v0Filler.json
new file mode 100644
index 000000000..a07a56aa8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d655g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d655g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61028f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfe83079da80cf4c7785e24be2cf24e1fc4237356d0822cdd6e5d5b4aa16f0d75",
+                        "s" : "0x1be7ef3a6f566fb3e48dd40feb836b587ed21f9bb4348a73c88e1b1a556ac7c9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d656g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d656g0v0Filler.json
new file mode 100644
index 000000000..f740aaaf4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d656g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d656g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102906064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x08707f439f47e2a44579367bb59b4798589dd5ccbbc00f2baab2899e84c7ec6a",
+                        "s" : "0x2000777f7bff13780ceff4156e3425117f63fae23fab07be3cc455f23fbab958",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d657g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d657g0v0Filler.json
new file mode 100644
index 000000000..57cce85d4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d657g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d657g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102916064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7a058675f92e0026f53fcf7609c2ac266ce7b9b80c5020aab82840c2463edd03",
+                        "s" : "0x1e161052820a1652c95c8a2cb7523680c04de6a1d2fc094b34e978ae06c84eec",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d658g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d658g0v0Filler.json
new file mode 100644
index 000000000..73ee717f3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d658g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d658g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102926064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc9b1ca236925a6ebf31f29a3780141cc8fd04dcae650c43438f1ed9b40f9d610",
+                        "s" : "0x4643928ddce6a1118aa5bd0e01ec2ee5211463fca3ef8c537fa24b13e438ad4f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d659g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d659g0v0Filler.json
new file mode 100644
index 000000000..b6397928a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d659g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d659g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102936064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd7a8cb543524c929063cf2ac24b6492f74411e3c650d0e684e06ccdb6d645348",
+                        "s" : "0x120ce320cd3d91bb0b4f74cea5b11e374fb6223a398884fb21493866f0c0e4d5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d65g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d65g0v0Filler.json
new file mode 100644
index 000000000..658558a91
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d65g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d65g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60416064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x70a376a7a30593eb5c508335a859a6ec2d554645eac8bfbf12310082f2543866",
+                        "s" : "0x5936a12327d77d0b0acbcc1d23e2136fd4f93cc7d68587676772e5266704e974",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d660g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d660g0v0Filler.json
new file mode 100644
index 000000000..106198b42
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d660g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d660g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102946064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd4f76dcc05be8ac2fea8dd66e880c4832cf0f2d0743e0f99cad47d3cc649360f",
+                        "s" : "0x1cd28d7fc471bec6f63c2d4cd7ac6d683bcf509926e20994f8fb4119deb45c4b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d661g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d661g0v0Filler.json
new file mode 100644
index 000000000..336f09a2d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d661g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d661g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102956064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x45ef47970419ac0c7a63f2b831e3b283322114978cb95c61ba7295937547a98e",
+                        "s" : "0x6f30dc74ea86e8338035246f77dc7354b2ff72bd29d15c74328f6f61728238aa",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d662g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d662g0v0Filler.json
new file mode 100644
index 000000000..668084644
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d662g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d662g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102966064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbe228f8729e3c79c4b278de5705ac3f98f9943ecb2bb98b42bf490367286d98d",
+                        "s" : "0x0d34dcc981a5d4c0cfa61c5d0bdb5406470b14aa6bd60b1babdd51e7c211ea31",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d663g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d663g0v0Filler.json
new file mode 100644
index 000000000..060468660
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d663g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d663g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102976064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x06ed9b8c36c69c1fc086b228c3e6b103ed5f4b4bda7a4a3434c54e7d9aefaa92",
+                        "s" : "0x55e2a0f697eaca2d640d58ea8f64229052c2ed7ce55cbcce627b8231750d7f3b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d664g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d664g0v0Filler.json
new file mode 100644
index 000000000..eca55dc15
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d664g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d664g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102986064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x01ec56ec1d37b590911aa767fe45589482a21061c25d9c91798ebe6f7fef5cd5",
+                        "s" : "0x788d6a638f01974252d1fc5bb9bd24c4b5bfa089c5d05fffc5365f6951e42cb4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d665g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d665g0v0Filler.json
new file mode 100644
index 000000000..c17063b1b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d665g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d665g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102996064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5df94ee5e6ac62fd3ba4c68f17fd12bc049564750fcb474ac838cb5d1bf7bd75",
+                        "s" : "0x66e9906a2836910dd62cf5f07e899e68ad55db7a0f7cc7046eb4c1f0c689ac6a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d666g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d666g0v0Filler.json
new file mode 100644
index 000000000..e222b4dcd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d666g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d666g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61029a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc75bb7d1387580765998ca39ea3c56f62906df1fbb2bddb30e3d52c74962ac56",
+                        "s" : "0x09d6b2ffdbc7d73f1b4f42fa8ebcb5df15536ec23254d23a42f251cb8f7d9a39",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d667g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d667g0v0Filler.json
new file mode 100644
index 000000000..a22235bf9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d667g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d667g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61029b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2dbdd0738ea30723facfcbae907a840def2a2ba2277e00f5068a5606a59aafc4",
+                        "s" : "0x16f9717317497f77e71bce18d06d680cfa7ce146c1bba7e7ac04aa888057c6a2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d668g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d668g0v0Filler.json
new file mode 100644
index 000000000..4f2b2e9e8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d668g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d668g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61029c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x206aac585b4abce7126264a00d2e1c9e6e55dcf3266df5120090135a610fac08",
+                        "s" : "0x37b668d26727707648a02c881c01fce162c14d3afcf515de6b326297c3a8addb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d669g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d669g0v0Filler.json
new file mode 100644
index 000000000..e76154d76
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d669g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d669g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61029d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x44338dea388c04a840c4b1a7efea33d285659fa2f56b1a45e08749e753630a37",
+                        "s" : "0x2d31401f410282e2e1bc94a2d0c7c15f814b65b511e807169e59c430cb090509",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d66g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d66g0v0Filler.json
new file mode 100644
index 000000000..bbc64899d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d66g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d66g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60426064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbe701fe0f1b6f6641cb9edce27b1c60e4d54251c1f926885cec900a2846e9602",
+                        "s" : "0x0cb0b79bd62e8212d3dd180a4207fff4e46ce706fa427b8cbe49761c8725aa33",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d670g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d670g0v0Filler.json
new file mode 100644
index 000000000..fa43a0b6e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d670g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d670g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61029e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd4cddd1fa64a6960826538e686836b8f93f00a87895b60171e6c27ef30518247",
+                        "s" : "0x0aaf87f42eeee0c6b8d5066fcd158007a27b0337b7ac8a93d8d89dc2f4e12bb1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d671g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d671g0v0Filler.json
new file mode 100644
index 000000000..9b12cb0c3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d671g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d671g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61029f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeb048e8f467b6f93bbf66161fac1ebc6ce2bda426b0743631bef63a405a1d869",
+                        "s" : "0x131d2b01179d49af9e27431a767fa2ae2aa2f52136106962a9e751f18997b337",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d672g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d672g0v0Filler.json
new file mode 100644
index 000000000..d559157dc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d672g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d672g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102a06064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2f021861cb2a853f8e75db251eb07344841deb45b0c1f0aa2fe71e282dcf9436",
+                        "s" : "0x281eaa306f3e4b852c51a84a3e1e82f56448bee6cffe2fb523613f411b085deb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d673g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d673g0v0Filler.json
new file mode 100644
index 000000000..0c224b196
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d673g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d673g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102a16064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1faeb677d9aa5cc47203951f1e4d4d91e423bfc54c4ed9e247ee3834f5fbbbb8",
+                        "s" : "0x27fa6ae29aab7cc5a919c56328ec651ecb008c97acdec2137b3bda1f4f08a12f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d674g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d674g0v0Filler.json
new file mode 100644
index 000000000..b467ac74a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d674g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d674g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102a26064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3b953906e6582575b21d487c880733b089bc2e26ff6b00776b7d1bbb554d7466",
+                        "s" : "0x1a31386f1a4c7dadd7e714cdd17d9356e06ef6ade0dba50880f5ff19c55bd210",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d675g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d675g0v0Filler.json
new file mode 100644
index 000000000..a2adf2341
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d675g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d675g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102a36064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe6e797a4a36d44d2bd137bae19476c3483483c8d46cbf7435e6df4801fb34807",
+                        "s" : "0x5693dbea0b35131cb5b6e9d8cdf2e68f76e6a44671e7fae0e7c39a1c2518d3f9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d676g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d676g0v0Filler.json
new file mode 100644
index 000000000..c128b6fd1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d676g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d676g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102a46064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbb65dcbb68289137a01bce15dcaa348e639a02762958b72aa7c08f90b8c2606d",
+                        "s" : "0x6b4386dca0f2e514266f26c8abc5176d6e5f4ec949f19b610c18a045ac409241",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d677g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d677g0v0Filler.json
new file mode 100644
index 000000000..eeb453552
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d677g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d677g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102a56064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbec9d900a72f7784b1a80afd7dd77297ba426c02d26ee790f696ad5362f6412f",
+                        "s" : "0x38676185a824eea9d038d5f3762d76f503944cea300990f80d3e30aafcf952cc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d678g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d678g0v0Filler.json
new file mode 100644
index 000000000..f703f5113
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d678g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d678g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102a66064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd8d152958b5587971d44987aa4ed0ba22969f286bdc9240681a96efb2b52ec35",
+                        "s" : "0x1fd747c4981ddef86836ff735489918a2538ae95780c345c52cd1bca420af1fc",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d679g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d679g0v0Filler.json
new file mode 100644
index 000000000..69436abe3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d679g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d679g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102a76064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb4c3a5ae5205a866772a98277124e06da71258ea2a89bb0cbcad44576ea36511",
+                        "s" : "0x42a146c650dda3132760b6bf810afdf17d7520faa67c44c8f7cc3cfae26b6d32",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d67g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d67g0v0Filler.json
new file mode 100644
index 000000000..2bc70151f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d67g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d67g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60436064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf261b467f00ae3baad17dd718d7838e317a9db3a61ce06cbfaf4af251910c175",
+                        "s" : "0x4436c385835b573f01452151efc0a3211c4c55886d17d486e9c89d2938a8b37e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d680g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d680g0v0Filler.json
new file mode 100644
index 000000000..46bec0476
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d680g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d680g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102a86064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x38b1f3f942c6c9e64d5d8a772dbd221ddcb8a3357d97d4653049b98babce7d74",
+                        "s" : "0x32605768b44e82e6598ef1575d836c684321bb4bd623ccb8d8a4f64ebc27196a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d681g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d681g0v0Filler.json
new file mode 100644
index 000000000..897dcf8a2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d681g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d681g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102a96064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x693e08d330e624c6e4dc40a6b5c6ac0e3fbb8448c0360c052c9c52c9d6401c7f",
+                        "s" : "0x71ce397c20d327fb03478d12b17cbecedd19072e81ab4e6dc13f44ba8f6d9e3c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d682g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d682g0v0Filler.json
new file mode 100644
index 000000000..f0d63e6d3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d682g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d682g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102aa6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf370dc16b5f80402a51005d277087eec53e23dee4f57b7b628ba09b6861427a8",
+                        "s" : "0x79d4de68f9884a0ad3e992ba9f4637680b34277ba22b9ef287dae5641d62bea8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d683g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d683g0v0Filler.json
new file mode 100644
index 000000000..a3cb7188b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d683g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d683g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ab6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbe8b937490b2ca9234de7ca2011d5d2d23c113e9e0a79dffab21af318e42f76c",
+                        "s" : "0x1766e3dc989486dbbeb389b7b0b491ab2ffa2c1a1f10aecd26aa7722fca76e6f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d684g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d684g0v0Filler.json
new file mode 100644
index 000000000..18b2e4637
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d684g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d684g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ac6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x077a2ac5c3413cde9311f004d98db4d25ee02388cd8e478bc71b5abb05858379",
+                        "s" : "0x5e0f9ffa46470be61db4c7ed7fc428b6725ec9df20d0b2b9279536090801baed",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d685g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d685g0v0Filler.json
new file mode 100644
index 000000000..7a3473329
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d685g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d685g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ad6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd3036aad4d386e65df9627f5c1021cf6c97bf5be9f378b97c12c056a45272f8e",
+                        "s" : "0x1d50103ec7778b3980db210f24603920efe3485c186975775d98d5c097fa89e5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d686g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d686g0v0Filler.json
new file mode 100644
index 000000000..5cdff86e0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d686g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d686g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ae6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x859ea0ed82cf1b055c5b3ad129ec02591dbb26f81e90de1f01f1f2c212eab44c",
+                        "s" : "0x51d59960b9ccafb57ea263ce66880b47288709c8017efa69a65fbe3f7501cae4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d687g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d687g0v0Filler.json
new file mode 100644
index 000000000..53d7971eb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d687g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d687g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102af6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x08294d1d0f1b6aac8e7cca0ee194211f122aa392b6bc93ecb0d4572fea6a03d7",
+                        "s" : "0x32300ea02bec48d704f0be374eb211cf97cdd59af0bb9648b66e444f2af52d19",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d688g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d688g0v0Filler.json
new file mode 100644
index 000000000..c71ec8148
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d688g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d688g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102b06064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1326d80e0b5fc05d318a4f2e44ef07b1e0db1772e50daf0b40c089e6aa2602f9",
+                        "s" : "0x24c776e8c3a05f9d9e2a327379355d761958831d14c11575d9b6fa01fbbd97ec",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d689g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d689g0v0Filler.json
new file mode 100644
index 000000000..c9773bc72
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d689g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d689g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102b16064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x71c781bca64e07edb9c95b464625051f6574b5a8f8783a60eb4e1fb5bbc19dc7",
+                        "s" : "0x702be0016a7ac8bc91ca999c9b7c5e675d2daca5e7dd821e0c3dd38d0484d590",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d68g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d68g0v0Filler.json
new file mode 100644
index 000000000..29a3a4dc5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d68g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d68g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60446064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbe731bffef88d113cbb60b54b96ad8e03f86c89e7cde8b94127bf0594b1aff69",
+                        "s" : "0x4e086c2bca131b91255e9d5fc1de18c1f4202501147f3bb46cc048408d606fbb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d690g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d690g0v0Filler.json
new file mode 100644
index 000000000..249a33cc9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d690g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d690g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102b26064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd50865f5bf890ce14d6d4e67e428e6d8b7060157a7d9f426864a9f2856412111",
+                        "s" : "0x68533f91426e526e500221cbe789c3debaac8b958152300d0b24fbf953551bb2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d691g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d691g0v0Filler.json
new file mode 100644
index 000000000..773e09d81
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d691g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d691g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102b36064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe78ce7a183ad3b2cdbe61dc88a6e7a1b51d9677eb59726b2d558869a1e48d172",
+                        "s" : "0x114fadc9ffbff10f150749d3f7281a83295bfddf3c42aa2e2ef2d4a23647d8aa",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d692g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d692g0v0Filler.json
new file mode 100644
index 000000000..b5625e614
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d692g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d692g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102b46064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x08616ab3ca63b9f5ba6f05b4be5b2972c6b4eeb8da0239a9438482e437e7eff9",
+                        "s" : "0x1c00ff171dce7aa685813cb0b1fe6fcc587a7cf145b5d8b939c5a0de38b205f6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d693g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d693g0v0Filler.json
new file mode 100644
index 000000000..06732c583
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d693g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d693g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102b56064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x940141e6e6221ac09e1782293efd64504afbcc61deaccb72b2fce7e2147de023",
+                        "s" : "0x0747852e7d26b707b1d3f71ea0fd304d661e124664d792233cd709db307a6905",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d694g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d694g0v0Filler.json
new file mode 100644
index 000000000..e950c8162
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d694g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d694g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102b66064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3daff403ddc0ae77f61a5e73ab0b6fe65f1101744b63e3b5f8f5f15a414a1ad8",
+                        "s" : "0x3ae14e909b2d4564a9738e262b2c5c488271d126893f2615d5f57e3f1fd5d53a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d695g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d695g0v0Filler.json
new file mode 100644
index 000000000..397402583
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d695g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d695g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102b76064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4810abdbf2b8187d9fc7dacf70ed888521ec00ebb4f7a4c935f9b8a13e4c159d",
+                        "s" : "0x22edb34de6d3b0dcb21d4b0617a15a581d7d318310a077a42963e794561d606a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d696g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d696g0v0Filler.json
new file mode 100644
index 000000000..4d0d165a3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d696g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d696g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102b86064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x90443acc880954d17df5e1e5095b12ac0f052eabccb39988124cb98e116c3b3e",
+                        "s" : "0x09d00df046737128c995e64e3cf99f0bb7f27823de2f60ff84d37441d32cd53b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d697g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d697g0v0Filler.json
new file mode 100644
index 000000000..ba28b4ea9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d697g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d697g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102b96064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x40102ee39954d681b23fc836745d63a911a106950562075b9f62a8dffdca7e61",
+                        "s" : "0x5a99223d28297c35017a557e7c6decf4a8559675398ef659cdf9fe867cd272c2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d698g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d698g0v0Filler.json
new file mode 100644
index 000000000..32ba64e26
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d698g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d698g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ba6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf9d1487b3379efc5a0513255cb620c7d0a095ed39cbaaa55da0ea4b8e36a35f0",
+                        "s" : "0x2650d18b7863987b88a1a12607776a712f39efa12c5d08edf9f2bc289a2a17de",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d699g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d699g0v0Filler.json
new file mode 100644
index 000000000..6091a6777
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d699g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d699g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102bb6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x97abf60958125c72ee8bdbf9f6ba7f484bf86ab4602a50e30ddce0dcb5a450a3",
+                        "s" : "0x77ee8fa1ce9aacb358b58721f671614337f20e690cdc36202b9ab74fa46644e8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d69g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d69g0v0Filler.json
new file mode 100644
index 000000000..c47bfef6d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d69g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d69g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60456064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5c5d5bb78d1f43203bef1a3913b32f7383d8666c64e392d4699ead15a4541e7f",
+                        "s" : "0x0e997636468cc5c0c2d85bead16a544a912400278688bc55eb1a091cc4b6aad2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d6g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d6g0v0Filler.json
new file mode 100644
index 000000000..8dd4da2d8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d6g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d6g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60066064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdf97b86e81b2a8ee84a64a05b23d1e1772b11d9252a69315317977b1513dfcb8",
+                        "s" : "0x6ef59802bf723989ee4ac7ad9b43282873718f9e6bacc24ced5e6dc2f02bb984",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d700g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d700g0v0Filler.json
new file mode 100644
index 000000000..07bb62d3d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d700g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d700g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102bc6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8ad8659afeb9e0183de39710800009e5e563e320139845e21415bbef4440308c",
+                        "s" : "0x16881c8bcc5632b54a3005ace8a8e42666039507e449ed7812d23a25032d2b76",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d701g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d701g0v0Filler.json
new file mode 100644
index 000000000..b35409a49
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d701g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d701g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102bd6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa8a008e2ddaba268c149c298d007b1eccd2bc5fa3e3d23a323aa837868e1f5c3",
+                        "s" : "0x352b1f9391aab68f41e5dbcc5576421dec28235f58c872082d4d9b2f622fbb3c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d702g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d702g0v0Filler.json
new file mode 100644
index 000000000..fce146232
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d702g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d702g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102be6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa91dcd499227e5fef3d073368010d88a8defee1155f2c53bcd32d1214aafc92d",
+                        "s" : "0x160db8bfc0900cbbc39baf323634692634fd07d771259b6c974087ed1874b76d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d703g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d703g0v0Filler.json
new file mode 100644
index 000000000..f891b2ac6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d703g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d703g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102bf6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc11970a38bc55d659934d3ceb2f8c9cef41076acc0b2a187f2f40dfe178f2b55",
+                        "s" : "0x747dd9c915e09697d3ab53299773c57b468e8503ada91f30979cbb1eec3ff07b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d704g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d704g0v0Filler.json
new file mode 100644
index 000000000..72d1e5ee6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d704g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d704g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102c06064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x526197a9c4af4b1c6e110eb2a57152b60513a02a8e17ad0ced4b7a41c0606c6d",
+                        "s" : "0x10b2d151ea00031016efa9dae4c8126b0cbc855648c065ec96f3cc575ddcd0a2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d705g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d705g0v0Filler.json
new file mode 100644
index 000000000..776790918
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d705g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d705g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102c16064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x586e3a4277c6c7cd5fe0f3560b8f9ae8fe2435e6e3915d096bbd87f578f1cdd0",
+                        "s" : "0x2c2c03fa9d81bc436a67887bc6151fece4980e7274408bc1e7c7b47626031b61",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d706g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d706g0v0Filler.json
new file mode 100644
index 000000000..b36fc2ea6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d706g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d706g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102c26064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0f8d8f54839a8d4b448268949715a8833bd1b85ab1820a14328bf511b6b769eb",
+                        "s" : "0x0c28cea7c9e9662db317e0b906e08c1698d8b0ed8cbc75e58415d5a8ff556acb",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d707g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d707g0v0Filler.json
new file mode 100644
index 000000000..1294d4a55
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d707g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d707g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102c36064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaedc1ea24f779ba39b63e1c8a927b44d601d4dd85188870347aaf7808b133dc9",
+                        "s" : "0x4794721be62600d0893a3a4e90844705a181ebbbebc201ea3c32753a6b51422e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d708g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d708g0v0Filler.json
new file mode 100644
index 000000000..b49dcb90c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d708g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d708g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102c46064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaed58acc779d662f3f18094aaf66b73f6a182f652fd2d6152fe1ad00f19c0595",
+                        "s" : "0x4f8f4a9a8240727b4059be641f4959f37a4ac19beca8e7f328d75231c5fa83b1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d709g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d709g0v0Filler.json
new file mode 100644
index 000000000..7775354c6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d709g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d709g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102c56064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc3f9bc9fe8745ff47ca0e002f28fb64aee4513fe13be28a7d17089706851873",
+                        "s" : "0x28604268a2bf751c161bde5892edf65c5bec535ca21cd6759246bbbbda7e5f7a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d70g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d70g0v0Filler.json
new file mode 100644
index 000000000..dfd9c74c6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d70g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d70g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60466064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x580eaaa95b5d5108c1dfc1db9029fb2ee8fa40b436201137391bef651774b148",
+                        "s" : "0x73c5c1ca86dd3080fe9009d9ab916717a461e85f0c5b685b7d090c42a03bfb17",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d710g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d710g0v0Filler.json
new file mode 100644
index 000000000..c6cf83142
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d710g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d710g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102c66064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc4ec44a0d6b89c0632556de307a8882a9f96478b1d881dd99e114b07dcf1fffc",
+                        "s" : "0x7970188a433f22aabc39453e087635120bc0c3f941d3c3300e71cafa6e255de8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d711g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d711g0v0Filler.json
new file mode 100644
index 000000000..cee8ccb54
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d711g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d711g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102c76064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x533a2c8940d7fd7ebfb29ed9c804fc9b5f9a6efd6732ab6e5c0324b04b92ec06",
+                        "s" : "0x5b9983cbad3dd81cf33a91241835a5caccda3685e3a4ec700ad9258bd8fde3da",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d712g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d712g0v0Filler.json
new file mode 100644
index 000000000..767826033
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d712g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d712g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102c86064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf3de5bcbbc554e72ed2e09c24aff4da9713b8617cb9e27ab3fdd5dc47a5331d2",
+                        "s" : "0x1608741cb2adc5fca2eb0d391ab536245d3d62c657af4252a88cf67d657fb34d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d713g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d713g0v0Filler.json
new file mode 100644
index 000000000..2f0e6ec42
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d713g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d713g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102c96064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd056f8d792470eea461c502d85d8ac00c6db0d0841cdc760c22a4032b6ff3d9b",
+                        "s" : "0x0fe1ffa208907dc554b4b797cb6e1e0707b9ba4c2df81fc52839daed6a2169e0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d714g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d714g0v0Filler.json
new file mode 100644
index 000000000..5c9ef7577
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d714g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d714g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ca6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfffa375316d5afa2d1686957bfb430fb96e81996da2944733013b9d1227add3c",
+                        "s" : "0x6a48cd86ee2bf5876d31e6add333e4837e7e323dd0cc68137664e47376529777",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d715g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d715g0v0Filler.json
new file mode 100644
index 000000000..be31694e9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d715g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d715g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102cb6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xadf248068976710380842632a0e89673871c8b2324f029f867241123737f22a5",
+                        "s" : "0x69dd608a9f7c32ba90016652155a0b4a3f35cd794d4ed5ce2ebfa7dcc2648744",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d716g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d716g0v0Filler.json
new file mode 100644
index 000000000..bbb3adabc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d716g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d716g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102cc6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2225e9474934c68779f897d9255f115cd0b5772ab8c5e7e8b618b852787dab65",
+                        "s" : "0x686f995c97f8202827e07a3e559df4c3b9941596b02007a0fe42dfe8cde60cb0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d717g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d717g0v0Filler.json
new file mode 100644
index 000000000..1cf6602e0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d717g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d717g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102cd6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xde006e3dd6357874847e836864f7ee05c4b69bbea77ac6d03265be784a25c7a2",
+                        "s" : "0x6164fb0e054ed0fcde51a98daebc2ce7c5a8dd7b7b99786ef698c2a0315722ef",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d718g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d718g0v0Filler.json
new file mode 100644
index 000000000..361011d4f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d718g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d718g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ce6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfc05b8a5e3a1722f0ce0c949b5cc98bec21ed4ae5d85c74f6045b15c842a4a33",
+                        "s" : "0x3ece5912d8dce0e4931c033680ef143715f810a4d4c55a763bcb9c19f4a5419b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d719g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d719g0v0Filler.json
new file mode 100644
index 000000000..add2e66ef
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d719g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d719g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102cf6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2deefa7d74b3b28ba0c1f5762a363bf06eb6985170a845b550466d6f31384272",
+                        "s" : "0x2c57485b553babe0cb408759238f84993a80d8aedf05eed94d1b6806f6982a50",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d71g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d71g0v0Filler.json
new file mode 100644
index 000000000..1a0a49ca1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d71g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d71g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60476064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xac6d5a52ae1d931ba886715276cc2176a99f8da7f427734106c1f13601c0f5ed",
+                        "s" : "0x4ad25f134267b16fe08c098225c9830f5c1942e50aaa98cbc798505ec86b2b14",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d720g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d720g0v0Filler.json
new file mode 100644
index 000000000..57669b3d3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d720g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d720g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102d06064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8336f3bfaaa0d3e258713bdb439a64585df8cd41f6b43f63b8926e8f8c4ab3ff",
+                        "s" : "0x057d5191d0eb982bf24fc422a0117a5b0741ef4470cb8c55f55572a8e188835a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d721g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d721g0v0Filler.json
new file mode 100644
index 000000000..e886af5c6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d721g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d721g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102d16064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf69cf7764af53bf806ca9eb6ede0c0d366eeffda41a199a227cda31346b025e9",
+                        "s" : "0x0f488a7da59b2804627eb0486c11dc3e2152e36fb15d064b23016f32c30379e1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d722g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d722g0v0Filler.json
new file mode 100644
index 000000000..69f8df947
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d722g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d722g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102d26064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8f74d88f82eae8ae07aee51e5c6aa43df8e0c5a9c3be35a6952c39d9bab5f113",
+                        "s" : "0x64e4cee5ac46cff73e79c919aaf0363a37b16a8870228d12ace1880b7b45d214",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d723g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d723g0v0Filler.json
new file mode 100644
index 000000000..bf0bc98bb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d723g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d723g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102d36064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x34c385cf3d1916f9168a6809f5e5a87586008637cd67f9a54885c9f48d96d88b",
+                        "s" : "0x5f6e64fed89b1a2863804b97c2ad366eded82bfab15a480d122a102be3dc36da",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d724g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d724g0v0Filler.json
new file mode 100644
index 000000000..1c359ceec
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d724g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d724g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102d46064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x13700c1463e98b03a651fd357197841ec26df766dade89d82e0df55845f8ae77",
+                        "s" : "0x69e8e7fc9c90e361fcb51834a2d96c4f9c56c6c4dedd031d4e85020d3ce00953",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d725g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d725g0v0Filler.json
new file mode 100644
index 000000000..764806739
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d725g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d725g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102d56064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6b724fda40fc2a374c13c37166805b822ad4f4e72dd227af6ea3815c4707f79d",
+                        "s" : "0x5781439abd5fada63fd61b2f85d51bd24ef03327dc0ced1ea0db7f770065906d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d726g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d726g0v0Filler.json
new file mode 100644
index 000000000..0e9894e0a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d726g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d726g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102d66064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd73ff7af7a84cf8770e51080d2f953f9599c1fe67c85f16e8a60f59a3aef3d2d",
+                        "s" : "0x74d76a42df7a726b6cbbb9fb9966ec136e8bb8fa47eda45bf8b2e25b4448ce74",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d727g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d727g0v0Filler.json
new file mode 100644
index 000000000..9829d32f6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d727g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d727g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102d76064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2e4805b63e3157a16a05ac4508c5a44390a84892cbbfd9cc646d64d85b5de00d",
+                        "s" : "0x45f645d6c1d44ba37b015935edf632bfc1397bc2f2462df38400d5819942a8f8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d728g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d728g0v0Filler.json
new file mode 100644
index 000000000..84721dd31
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d728g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d728g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102d86064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x819726d7004fcd0dc51e6f7eff5aae13834db25acfa83ddf33cb51887cbf53af",
+                        "s" : "0x0d142d79e5b0c2b7cab44f27a993b28dead74ab6c5e36afafef87dadb92484a7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d729g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d729g0v0Filler.json
new file mode 100644
index 000000000..d02ae62a6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d729g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d729g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102d96064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7e32b67a9dde8e629060f5f118cfe579375c6e7dcff99f8ab845befae632dc07",
+                        "s" : "0x28add7626bf232ae2ae19019b82e35c82df6e894df727e773e4a5055239f1381",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d72g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d72g0v0Filler.json
new file mode 100644
index 000000000..20074a4fb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d72g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d72g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60486064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0e77dc0f348257e54e97fac72a0fca3501ce24b183804cc31d0ce4795b2adf17",
+                        "s" : "0x7b82ee29e1822e3df65adae48d7f619d4e5544c0b6bbe8f9ff9e725bd7a8fb13",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d730g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d730g0v0Filler.json
new file mode 100644
index 000000000..a82d61460
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d730g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d730g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102da6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdad25950b4b805b95e0b5ccb2ebc097c7813c3e4e638660d90e64e78b11c2da9",
+                        "s" : "0x1e806bfcd6066dda6043b0977181783154de5d12f4323e9a6eecccc2767f6358",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d731g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d731g0v0Filler.json
new file mode 100644
index 000000000..776ce15df
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d731g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d731g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102db6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5fde1b6efba03a8c88ebacc930111ba5cf67369e1d49e9acbb2d939c2961d684",
+                        "s" : "0x60e6c17296866670491fc900fe4b7536ed81606e947eee784203039d685b73a8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d732g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d732g0v0Filler.json
new file mode 100644
index 000000000..a02613177
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d732g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d732g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102dc6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd836e6516a3dffed7cc063b198fcd3d60b1bc7996d45178ab1af7b0324020082",
+                        "s" : "0x2ee616d77dba7f1f8a0fe13227412ac545d86e4c112d3ede8b6d0d47ccc47959",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d733g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d733g0v0Filler.json
new file mode 100644
index 000000000..e73ace04e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d733g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d733g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102dd6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2f79f62b20efaab4472d80d7a51defbc189b86c3583aafa5a1243ec807296f2f",
+                        "s" : "0x3d91d5fcb6cd387995ddd64699df21e7b61542bb9240d0d2a5b069a57f19ae45",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d734g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d734g0v0Filler.json
new file mode 100644
index 000000000..466d00695
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d734g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d734g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102de6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x23ba17f408feaf073f4d5ac3bf05252d39e79371818a6f63baa2e0751b8ed9a2",
+                        "s" : "0x2fe626f5311f559fa6998f1ee1ab7521b0f1c055beae5354b9fcd907d16d44dc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d735g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d735g0v0Filler.json
new file mode 100644
index 000000000..dc3f7cb4b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d735g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d735g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102df6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd4f177856d072c0c15e797d4c4b738adb43bf38255c7ad7f4e762691bd098b60",
+                        "s" : "0x79bac5a436044b95de3333a8e2090948f8008f59c73cba770409a2e6a318f4b9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d736g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d736g0v0Filler.json
new file mode 100644
index 000000000..241c5d724
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d736g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d736g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102e06064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x446f2fb6f45ac70298529cb7d8fde5b46054136cfae53ad2c1a09de1382c3b68",
+                        "s" : "0x599448a480cd4064706c14d2c9b6d49b6f47912c314dc679756bba33c5355a2e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d737g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d737g0v0Filler.json
new file mode 100644
index 000000000..811d8d1c2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d737g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d737g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102e16064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x86645232bb3e67db8d400d9805e3beac4217e2364eb01af299aeae837aafbcc4",
+                        "s" : "0x49ccb47a04d64a8dc016a7da27d124d4b7cbb5207bb632de0c0cbfc43c683890",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d738g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d738g0v0Filler.json
new file mode 100644
index 000000000..733f2b786
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d738g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d738g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102e26064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x95ca86de89ac0af89d1f8e4e23fc1ed2fa49b5ea8f709b45449500eb7709fba2",
+                        "s" : "0x6c38dba9a05e00d0d13a76a81b7831dba3be7cf8be454ca3c338a60147553831",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d739g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d739g0v0Filler.json
new file mode 100644
index 000000000..d1cc76f8a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d739g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d739g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102e36064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdc3bb00366f239e9b55abfc5811dcfb8fd2bdb6c2aca4fc6a280de1a98983f20",
+                        "s" : "0x034ac267a0e3b2244eb05475aa349aefadb09bc2193861050c082c4056cde3e6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d73g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d73g0v0Filler.json
new file mode 100644
index 000000000..1591d06b1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d73g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d73g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60496064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4a08b6d966e1face64f67a6224ee63f9ff7606384f0b39956eb8fb79f3ce9d7a",
+                        "s" : "0x7397a76ce1593aac7b52dd99ac527c54eb02f702316d1a1491f36c3e64b59986",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d740g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d740g0v0Filler.json
new file mode 100644
index 000000000..0772067c6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d740g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d740g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102e46064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd31317544d3319dea1bad7f2fef1b444d83b02a1f8f4a4e37c241acf6e937569",
+                        "s" : "0x5c805cdd6e91d62b2c7ec414ec73047ed35dbc01de2dbadfa200ed64766af9c8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d741g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d741g0v0Filler.json
new file mode 100644
index 000000000..f47d91b39
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d741g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d741g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102e56064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfaf116e18d9e4fcefdcd7def84c240f3944c7eda1402e6a5380fd82859ba5093",
+                        "s" : "0x1cb5e3191a2379a60f41566c1755ce01ec073a8a60838349407727c4aaf86f01",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d742g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d742g0v0Filler.json
new file mode 100644
index 000000000..76b51aa55
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d742g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d742g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102e66064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x10f48467d87fb3f25004b1cc07c8fe4b3266c89ff33cfe9442e25c598e93ff3b",
+                        "s" : "0x71f26774e5c531e49d266b4c33aea614c4bc8e79f49e2a10facc92646fc1fdf9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d743g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d743g0v0Filler.json
new file mode 100644
index 000000000..7d4bbd94d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d743g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d743g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102e76064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe571c6013f787909b670368f7921e572f835e8f7257ca3ed7fa54d3598e97529",
+                        "s" : "0x59eca94ad35335b258c2a927bfd5c58184911f2dee42e8dd988f2188a3747372",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d744g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d744g0v0Filler.json
new file mode 100644
index 000000000..337e3de51
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d744g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d744g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102e86064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x89bc51cc9ba1bea51e22fdec43bdc8618b7b7031f25e42ef3766d678554da9a8",
+                        "s" : "0x61a3668cc1dfd80673d6daecc6e7143617f16c3b8cdec1c0b444b6ed35e83c0b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d745g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d745g0v0Filler.json
new file mode 100644
index 000000000..30d7b4ccb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d745g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d745g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102e96064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa717c37b9dd9c25f1f352b087a61faaff2c51db3da5ad3259632266218480b95",
+                        "s" : "0x2a3f10521b9e0382a391c0052bda5719df384ea4f782c3eeea9ff4226c5d42e5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d746g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d746g0v0Filler.json
new file mode 100644
index 000000000..9da0de7d3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d746g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d746g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ea6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2bfbf373b70cec8ba5f651733b75554b320793e479f3309fd23aae77da6d2807",
+                        "s" : "0x6252041d1c426062c31ea7f00043226709021a5e8d75cb41e73e4db084084cc5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d747g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d747g0v0Filler.json
new file mode 100644
index 000000000..6829ca13a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d747g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d747g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102eb6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcad8a30f11998b1a20c73f613ba2fb6cd3f2562a1c7cb77cd9db868f906b355d",
+                        "s" : "0x097b9a113a1f0ccf666588d465923dca9a94d08b42adbfde7c8097742faf0456",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d748g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d748g0v0Filler.json
new file mode 100644
index 000000000..24bf2014b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d748g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d748g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ec6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9fe13d5df738cfeb4d58de7f822fea0cefe6ffc8f4a513d496b6ae49947e7f6a",
+                        "s" : "0x543878ae108bb9a6ce5001d0576746385e2e4eafe1006b56d97366bcebc0acb6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d749g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d749g0v0Filler.json
new file mode 100644
index 000000000..c4c15a4fb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d749g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d749g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ed6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd3a6f31205f9495e44b4405eadffe737c95942e16abc8e6db62a3220c0f32d7b",
+                        "s" : "0x2a89fa5d48e34bb57c278d0fee87ea75453ea6833a9654c14eb255ab00548d16",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d74g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d74g0v0Filler.json
new file mode 100644
index 000000000..a582523a9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d74g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d74g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x604a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x16d6e100a8984c5f0404269f2d2156d2114b7b5c544fa70f2fc9447cf959b0c0",
+                        "s" : "0x135a9edcda7c95d8f0b4f10c7b3d5a0c8994b484ea8feae53fc44b36ae117bef",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d750g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d750g0v0Filler.json
new file mode 100644
index 000000000..a54fa77fb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d750g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d750g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ee6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x793c587c8d4a02e0818a51e71a506ebb0765c8685d022e937b11dc53c0da92ba",
+                        "s" : "0x64aa9bc1376d90850794a7882d559ea4bad776e13ac296b9a6f798b9c6130897",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d751g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d751g0v0Filler.json
new file mode 100644
index 000000000..631a6a87e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d751g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d751g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ef6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x72869e731d7f97dcb2c2bef50f5e7f689a95ef4b9ff1a2b44114c63a2f90ba15",
+                        "s" : "0x4e5cfb5ea95caee7fc70a7d65db1f149b986b40bc50a0e9cf015015a12df2240",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d752g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d752g0v0Filler.json
new file mode 100644
index 000000000..d0180cde8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d752g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d752g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102f06064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd732a309e552d12e99d24dec3df4698c58a8c690b03071abe4527fe8299d1b12",
+                        "s" : "0x54353d70410539a314dc3ca1f5f1499989883530bbf469057183d4adf8e1f387",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d753g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d753g0v0Filler.json
new file mode 100644
index 000000000..8d6c9360f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d753g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d753g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102f16064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x21ced3b037a7a102dad0fab0256fbc3ba0812fd723807e5357a264070ffc9367",
+                        "s" : "0x27db5dd24049cd57abdd48be01c764a6ce9c83ade9caf66fbdb521c90a6247f8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d754g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d754g0v0Filler.json
new file mode 100644
index 000000000..d3c98deaa
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d754g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d754g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102f26064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x296753589b5c914e21b9a8dcc76acda2bdbf53021a3c3143b1d46e776b726dd6",
+                        "s" : "0x1ca89f82ccb4857a8928744da0136733257d4e31a01ed2b7a4ccd49564555cd1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d755g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d755g0v0Filler.json
new file mode 100644
index 000000000..784e4cc05
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d755g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d755g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102f36064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x37a8e434785726666d428f8c77804a699c8cf6f6d84503b3a97eae03912db7e9",
+                        "s" : "0x34585eaa98dd8b0e11a8115deb06e3480c9db61f2147495445c3d85214057640",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d756g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d756g0v0Filler.json
new file mode 100644
index 000000000..8e7ae316f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d756g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d756g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102f46064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x47db81e22e6202dcd614c35f802d322346365534afe4b62ee61e617b36929536",
+                        "s" : "0x1cbde0131baa0dd592598e28d7d0944a337c38d504101fa88a72797e84feb828",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d757g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d757g0v0Filler.json
new file mode 100644
index 000000000..8f0e5c568
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d757g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d757g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102f56064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe187338c7897f3f8d075e697e17f9b41abdf31f0cf42a3436922fea62c5b0655",
+                        "s" : "0x3250290ae36146bc13706116913617b32e0818ddd4e32f667a733c73106abe5d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d758g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d758g0v0Filler.json
new file mode 100644
index 000000000..4c1a053e4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d758g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d758g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102f66064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcf8ce915777e168d5dd89350cd35e01c930311ff87ecd5f88f2d85b2adc2738a",
+                        "s" : "0x0e1b52b727e3ba8a13386a61b8752110fbc55296d63eccef1cb1e2ad58395df1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d759g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d759g0v0Filler.json
new file mode 100644
index 000000000..e87c4d04a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d759g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d759g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102f76064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfcdb523246a7dc36bfb7fec51f4c01ce04c385b79341a509cededa0a84ce9bbf",
+                        "s" : "0x399b38a2e61a6cc5aa52d7d6a4b194472f4af8d432fa9d6d88375125c3036885",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d75g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d75g0v0Filler.json
new file mode 100644
index 000000000..e7ceadd5d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d75g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d75g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x604b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbe0981a1870255432eb5be7982ed7660710fb72ad81179e977b9869299c88332",
+                        "s" : "0x07a61431bcb94de34e49683e17f36af074cd83ad1121ad7419c74575e38d76eb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d760g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d760g0v0Filler.json
new file mode 100644
index 000000000..1447f2891
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d760g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d760g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102f86064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x511df65dfcb112c3324bbe584211802a1e5af66f6fa9c0311ce89c35e86cbd5a",
+                        "s" : "0x06a6c6e9a85bd18f21819c12d5195eab4f72134d13745bbc0113feb8d4c5ef75",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d761g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d761g0v0Filler.json
new file mode 100644
index 000000000..a9665aef7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d761g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d761g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102f96064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2e45f20f927539514caddb90c8490ec51fc730c99dd207df8a09f37cf8c2fee5",
+                        "s" : "0x299c9995aa0fbc601a4fba0faefc2b08c04c98301555a6fc38cd562b384dce67",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d762g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d762g0v0Filler.json
new file mode 100644
index 000000000..53d0b80ad
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d762g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d762g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102fa6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf15d9c357f5d6c8abc03c67a92fe3c1ce17709bdd22b4643c827308963099bc0",
+                        "s" : "0x0ebcb06458013100e4b6d0b0fc0e410557cfe6de84399574bd8e96b723095838",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d763g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d763g0v0Filler.json
new file mode 100644
index 000000000..0e8eab257
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d763g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d763g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102fb6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0c0458d0e9bc053c7ee6c65bfce18b60a5a7c35fd388d2cf3fe124997b308b3d",
+                        "s" : "0x242e0eede220468e04b3fa0a03e990e3cea20df7f491a59476a1dbcdec079c23",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d764g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d764g0v0Filler.json
new file mode 100644
index 000000000..2b924c07b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d764g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d764g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102fc6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x033f24ba2bf516c68ac50b4a708486ee6fffe155f19f2ce2d28c24913e5d2d35",
+                        "s" : "0x10a298b7472aae0c8c760aba2a23745befdc5f526b5094bd8770c8140b80b3f9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d765g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d765g0v0Filler.json
new file mode 100644
index 000000000..55da9d169
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d765g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d765g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102fd6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x92727acfa882a07e1b248ea946240e288650ff81012085ee38550ad4544e5c30",
+                        "s" : "0x3d8ce4b4b51214fc00ab9f22b369ae693f2ca9202b3a84c997621cc3a6b72819",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d766g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d766g0v0Filler.json
new file mode 100644
index 000000000..fe6458e90
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d766g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d766g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102fe6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7d3c6d1a11161bed44d0b46f1e84614d0c716576edf6f3bce3757116e4d40b0a",
+                        "s" : "0x52724dc37573e6e2f33d61dacc6994a7d904d321125707f8fc745dddefa7613f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d767g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d767g0v0Filler.json
new file mode 100644
index 000000000..6e122c735
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d767g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d767g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6102ff6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x532a2e36db184388c17f877198e06bbeee2e7801222d8405de8d1a1f4ad203d7",
+                        "s" : "0x48f9bcdef69dae9b5e514cee606147d5aec1ce3fe1fc63a65554f6cf4a1b06a3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d768g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d768g0v0Filler.json
new file mode 100644
index 000000000..59d44e093
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d768g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d768g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103006064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x757c5e7cb0a40d711db1948e84788ffa6df28f4fef093cfc98dec39257438abc",
+                        "s" : "0x4a3d3304f9356e0c1286fdaadaec4c956745c0924a15b28b86adfc0c0ce12860",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d769g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d769g0v0Filler.json
new file mode 100644
index 000000000..a84b962fd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d769g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d769g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103016064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x768ee9b0910e4a63a154c0f9e8d54b65c81351ff6c9caea0e31d16efb48b68e2",
+                        "s" : "0x25dc20b6d100f343d2ed0318c036fbf1d6100165ab648237ee15df7edcad7be6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d76g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d76g0v0Filler.json
new file mode 100644
index 000000000..d9f33b4dc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d76g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d76g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x604c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x34d720ee3057356ca49c5dec7949e92d093abbf0b0b66d45878833f1ac6c1418",
+                        "s" : "0x7d3828662c172efb284aa4e493e40085aef16c81a988a0f23debe3825b230618",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d770g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d770g0v0Filler.json
new file mode 100644
index 000000000..6a5b7ad9c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d770g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d770g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103026064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfcb476add6a59a9462d09caa98ea591febba68af4f3e82fd09eb94fb29d00544",
+                        "s" : "0x4b6cda8a18b95a1d62273c13297daef4cfd09bf58c5c47bee391b8eb8e9a4bce",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d771g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d771g0v0Filler.json
new file mode 100644
index 000000000..212e9a5c7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d771g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d771g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103036064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb5124b8e0c66373771a5e843c072c481249a67878b6ee5cfcb751f300b936cc2",
+                        "s" : "0x3d5bb5413426651394d0df27abe99203fcb37ca2bd77ddb5a2ef11a1440554da",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d772g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d772g0v0Filler.json
new file mode 100644
index 000000000..0e2236748
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d772g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d772g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103046064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc31d0f128f6b6378b132577da9e63f0d90e351bc2cbceeceb44e6c15ddcc8d15",
+                        "s" : "0x79490ac957c593e91589b4282b365ee8908b12258d15447fa47b1946d5934bd7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d773g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d773g0v0Filler.json
new file mode 100644
index 000000000..823c20055
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d773g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d773g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103056064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0c3d7d55b04e12c4aefa469dd0063dd69d99571fd78fd411ceb56f837f4cc1d8",
+                        "s" : "0x267197b99d4fa554e20aae2cdc63fdccbaf80f3819f448770a07c97204181175",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d774g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d774g0v0Filler.json
new file mode 100644
index 000000000..4df86ebf9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d774g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d774g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103066064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x40facda595955c47cff01abf67b44a788912052ec53fbf356b7991899faa6ec1",
+                        "s" : "0x088b7d6ea96f32ca9ee69c23a2d84d9c1c2ae88fc4c65b4bd8c5fe4fa73b41a4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d775g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d775g0v0Filler.json
new file mode 100644
index 000000000..5faca7112
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d775g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d775g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103076064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x742cbb7e654bee8a871e790128683b59844874174cf8aa295faa407d5ed26374",
+                        "s" : "0x39cdf69caa09d13aa5747b11182271e48eda2478d1d6a2906f5b8744df70919f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d776g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d776g0v0Filler.json
new file mode 100644
index 000000000..d516dfadd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d776g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d776g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103086064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc199d9943e1d100781fc1985b5ec9edf339c3a94239f0d55d2ade596653a643b",
+                        "s" : "0x16608ccddc6e2a708b7495686eb9039725d60d84df4fd9ba55dbed209d0300ee",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d777g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d777g0v0Filler.json
new file mode 100644
index 000000000..ee1147548
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d777g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d777g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103096064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9d7bb3781a822880e2e7831d8e81ff998fd252ce78d78d350e7a7978e327da5f",
+                        "s" : "0x29244c4bf24f6d54c5b905b2792325abd372ca8e7e2787bd29b3d29de3532261",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d778g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d778g0v0Filler.json
new file mode 100644
index 000000000..48e51f5a2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d778g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d778g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61030a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x04d47291d9f1b31f97f6be6a14c3e50bd820581527fcd93c032a0ecae577480e",
+                        "s" : "0x241b39c7cd3bae685ec92621284e7608b0b30918b34a620e19a8e91a96224e70",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d779g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d779g0v0Filler.json
new file mode 100644
index 000000000..8976bc301
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d779g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d779g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61030b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xeff92ffad7bc4b4b2f98db63667c3d24566f0fd1708d526debf0042f58110a65",
+                        "s" : "0x506fc302453c85affc0b86c4aa1e4f78d9860aeaec877b1dcd625bbb4f9dcd95",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d77g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d77g0v0Filler.json
new file mode 100644
index 000000000..de9ef4655
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d77g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d77g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x604d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x939b382e71ae224f6860f5500d42d002d3bcd3f1c782757cf34b53f1aedef269",
+                        "s" : "0x614bad89b070417424834d223f1cb3b939bff4de9fec56ef5477b8add9345284",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d780g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d780g0v0Filler.json
new file mode 100644
index 000000000..020934c2d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d780g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d780g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61030c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9c3ea9e762bc69b4904add60c9ac5931760b61f040ee719b545d50691ce15b3f",
+                        "s" : "0x5ccb3415e071cbc929c8a315b21706860ef1c4c2d263784c57ff0edd10a6d221",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d781g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d781g0v0Filler.json
new file mode 100644
index 000000000..2556fa22b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d781g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d781g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61030d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x40e287a426232192d6f6464b2b3495b3e180e3e006d5abae1b96abc75175a894",
+                        "s" : "0x66cc4a25d10b8a5b79f9ba658fc1ecddbbe4b1f116b3c2f9378bd7d3eddf6866",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d782g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d782g0v0Filler.json
new file mode 100644
index 000000000..168d117db
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d782g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d782g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61030e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc9c585c841937b62a26611dafda69b32332c4fcd1c8d0d5063cfa2c583c0a336",
+                        "s" : "0x52fa315ed173041675ca2bf4e7f52462d0872f33f5f3f5a3dfd35be7dad5d4c1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d783g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d783g0v0Filler.json
new file mode 100644
index 000000000..dd10b809d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d783g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d783g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61030f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4ac9b0a1160c6c1d32cd3b657523d88684d42b8f760e7a4422daf3f76f4042dc",
+                        "s" : "0x1c9d9467013458fa6a550835b09b3eea11f677fbc956fec51c4dd00757d59fcb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d784g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d784g0v0Filler.json
new file mode 100644
index 000000000..5ed8d5208
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d784g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d784g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103106064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x68e58ec6bd0a82cebe61155d657e7265fe95a04af6d475986747217ea28ce278",
+                        "s" : "0x2194e71de946d18aecdbbe3c648f03fc8db80b445cda5294eb12548d34a5b3e1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d785g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d785g0v0Filler.json
new file mode 100644
index 000000000..49214bcfb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d785g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d785g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103116064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfa893044f8cf4931e13410cb41fc4a4f474f5f1a96e55f65c5a657d0e7a94ba1",
+                        "s" : "0x219c5ebf3e6b71ec8314e13e26b93ef99d4dc3111a305957857d305cc92529d8",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d786g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d786g0v0Filler.json
new file mode 100644
index 000000000..1b37fde37
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d786g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d786g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103126064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x159b7feeb6472a7782a43ad04b07b0361d12c50ac49b1dbbe580db704fe20080",
+                        "s" : "0x21559cd967e42199931136cce2a7132b7563aebee19dcdaba8e7703e81eba08d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d787g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d787g0v0Filler.json
new file mode 100644
index 000000000..9c905a3f6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d787g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d787g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103136064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9b6ebc14bfdfc0c99520dfe51c41552ecbbc629dc84bae114b2c279b9d555121",
+                        "s" : "0x554a26cb73fdc45bd0da392352e5e05f0b452638a0fe78bf335593af327df3c1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d788g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d788g0v0Filler.json
new file mode 100644
index 000000000..aab822ddb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d788g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d788g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103146064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x578f32a2e28157cc60820b2b24d454396f05d39c3e4342a5cde794f704c3a1c9",
+                        "s" : "0x4e591720bf1484a93ccfb54d173458a32ce96aad7bc056358ffe8fbdd16b0e14",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d789g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d789g0v0Filler.json
new file mode 100644
index 000000000..d737a91a4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d789g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d789g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103156064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc6256c876495d665bf58ad040903c227c625ded944f2aeff199104d73e07f5b5",
+                        "s" : "0x47ad7a4d684f566e5c1708f30900940c6300ce0f69be38dde0b1a7c5522ab23d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d78g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d78g0v0Filler.json
new file mode 100644
index 000000000..f72648be6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d78g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d78g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x604e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x34cc55b0f964f2f90701f6d327eb7b7c79bce8e39630ae1f27848e456778a233",
+                        "s" : "0x1b85432869d7efc9a7d576c669fee313822c3b23c037cdbfa646930648114b16",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d790g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d790g0v0Filler.json
new file mode 100644
index 000000000..6f8edcedd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d790g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d790g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103166064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5d6512770b01c2d21709b2bd41d3c0e2363cc53d1ca2d8359b7554d61bf9662d",
+                        "s" : "0x7fe38753d312a5fee971c677fd07696c3d87b01312ea41c00c1556acb2c1090b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d791g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d791g0v0Filler.json
new file mode 100644
index 000000000..2197b7a9e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d791g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d791g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103176064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8ddc6aa944e4569ac918b64de0a73e424ba9cc81f3898e837151af18205f19d3",
+                        "s" : "0x0d508f32826f63bb7296322973ce88418048c93089e1938854f7345e1653f750",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d792g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d792g0v0Filler.json
new file mode 100644
index 000000000..96571a43b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d792g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d792g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103186064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x918a329f8e596d804939835e9a21bb82d1330dc6c323938a2c3518cfa082a0ab",
+                        "s" : "0x536d6d10f4e72279e81b87f50b940fbe251237de95662651ab1d92a901301ef9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d793g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d793g0v0Filler.json
new file mode 100644
index 000000000..200b40444
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d793g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d793g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103196064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x39b3319116ac37e39f7a41892927c9e648db51cbfb0e0b49585691b306844f2b",
+                        "s" : "0x0a1ff14158ab8ba7a751f25e7e0bcc8413f550fdf491b8357072abb2197d4a5c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d794g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d794g0v0Filler.json
new file mode 100644
index 000000000..c1f5daa1d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d794g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d794g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61031a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xce2f6d1b985470f15ea10ccb9963203ec00d5720783c3699c3d77e39f65ea5ce",
+                        "s" : "0x78e962b162e7590b3494e402e7b55e27ee16714e1493561a245723ccdc71c9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d795g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d795g0v0Filler.json
new file mode 100644
index 000000000..0bf852e57
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d795g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d795g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61031b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6d9bb53c3de2907d7efba7100937d33bace206d8c3ad6cd46dcf5b42ac204096",
+                        "s" : "0x4ff526ac87c080eaef7f8b8157fb5200e8845011d34fc6404b0dddfffefa432d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d796g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d796g0v0Filler.json
new file mode 100644
index 000000000..9b2288b25
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d796g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d796g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61031c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2db3912fa3c405346dc8a61058abe7184ea98b662228451709ac3fc579f1ee3b",
+                        "s" : "0x15437cc675560bfec52dbd34685686518e688fa2128cfb7f9a4155728f140b1e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d797g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d797g0v0Filler.json
new file mode 100644
index 000000000..d511f902a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d797g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d797g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61031d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x33b15928e1a597891215dd51621acd1a8eccabdc32ed5d27e5c67c7ab8ac02db",
+                        "s" : "0x0d33f1fd3f24613d8d4cfc87eac8786154f57cebacd6496dc2421dde717c2b83",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d798g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d798g0v0Filler.json
new file mode 100644
index 000000000..4c8999cde
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d798g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d798g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61031e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe62f7edb70e9df0a5634f72d218939dd7ad0fc209f3229f0b73d18686b50f3a0",
+                        "s" : "0x0d78243a30a4e4aa2b07b298db052ced36418518ab9e41d447b3cfea6155d678",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d799g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d799g0v0Filler.json
new file mode 100644
index 000000000..7d130af0a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d799g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d799g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61031f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd217d409d5fdbeb7c15eb3201938e97d692bb84397f9543ee1d4af173c94677b",
+                        "s" : "0x1b9010baaa1862e9e68af4b7faa0e455acef7d4f8416441b30a2e94c1d6adb93",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d79g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d79g0v0Filler.json
new file mode 100644
index 000000000..4d6f82679
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d79g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d79g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x604f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x58f6d6cc37767538e8e34d5461081c8334c79c4ccb2cf570e671c7c45e7cffec",
+                        "s" : "0x0d6347876aaf3366f1050a0b899e271cde2a7194dfd3c91f71eb64d0c2c6da74",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d7g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d7g0v0Filler.json
new file mode 100644
index 000000000..7fbf5abeb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d7g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d7g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60076064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf94f96cd3a8df3f13e14fba3968ca466c37db940147b14fbb88a6250c0863247",
+                        "s" : "0x03b50a02d667a4462b6ab118d9b975e33f34cf744ca0f8091ccbec00bb191466",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d800g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d800g0v0Filler.json
new file mode 100644
index 000000000..7eadf0e7b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d800g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d800g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103206064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x67a69737da0a411a09b172927243b28c07e4a285bd7f975ecec28ac48b384f06",
+                        "s" : "0x46d01a74d178efe374319d22f5facc42ca4b01dce0fa2b621806c703a9c36202",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d801g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d801g0v0Filler.json
new file mode 100644
index 000000000..dbbddb0e1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d801g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d801g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103216064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd3f94ad2770bd757dd50ea6beb9feb3df05f1c177018b76e7978d8d219ee0364",
+                        "s" : "0x1c2b9c6796fecc43ccd917b5cfcd08b468e565bfa60f75f4bc42675f4e9f8394",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d802g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d802g0v0Filler.json
new file mode 100644
index 000000000..04aa40c83
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d802g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d802g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103226064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x92035da64787a5a1ed2e526cee060d14a4d256928cb6bbd7093831eeb5a51d01",
+                        "s" : "0x08385d76bc69738d94de45929224437e9deefefa03faaed760a9cc617cbcb82a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d803g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d803g0v0Filler.json
new file mode 100644
index 000000000..895766668
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d803g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d803g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103236064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4fe98de40df87ae4eab92420d3f14aecf5199737d6946dc4b8d100e18c4f4580",
+                        "s" : "0x3757089b6424f3ba835f4005b635d25193fe2e1242db4973b6a51a6976022f50",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d804g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d804g0v0Filler.json
new file mode 100644
index 000000000..377e63185
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d804g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d804g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103246064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3592e11aa69a10b49061caa479ab199552bdb46148b91bf1a19ebf5fb401886b",
+                        "s" : "0x75330ed392edbfe798dbdb5b371993a48a5002af0148e75e85589fd28ec7bfa5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d805g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d805g0v0Filler.json
new file mode 100644
index 000000000..4d7acf911
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d805g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d805g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103256064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe4e9e5e27dd183768d03062d7359666227d02e9c041e08c95c44853f81d977f0",
+                        "s" : "0x2fdac230f2f4389b8d7274722cf35f28b6f9841c9a849b0b042539a53a783f22",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d806g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d806g0v0Filler.json
new file mode 100644
index 000000000..3c5b96586
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d806g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d806g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103266064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcd90883ed6dcfaca04acb5ddd94383362fcd8e37c31a324d61d21a686bf9d625",
+                        "s" : "0x4fe0bfc8e44c0375faec767746458db69638b751bf2759621f21b9fdbaec105a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d807g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d807g0v0Filler.json
new file mode 100644
index 000000000..324913b17
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d807g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d807g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103276064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2a5eb70005d6e34f49b80d860ec7e225a76284aacdd6d4a5e8ceeecb78fb91b5",
+                        "s" : "0x0892d0c9503330b3a02f2de54da27641432fe89240d3484308769d81f75baa24",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d808g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d808g0v0Filler.json
new file mode 100644
index 000000000..4edf44cea
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d808g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d808g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103286064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x17bf31e949c1ed52d8fc6d21895dfb821ffdfe87da2145eeb7162060b73299d7",
+                        "s" : "0x632704b3f3b7997340cc162a2ee3f5db0913b73b1ce788010ccf527660a6df13",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d809g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d809g0v0Filler.json
new file mode 100644
index 000000000..1ffc5c0ff
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d809g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d809g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103296064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8b16b26397f4209f8f87638f70c821048714e2c14e4525da5887fd6196633ba3",
+                        "s" : "0x010e0e77f9bbb388cd00f8efd9bda4752df5dc0e8b5275250c9fa4d6790e0411",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d80g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d80g0v0Filler.json
new file mode 100644
index 000000000..5aafd4a0f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d80g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d80g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60506064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6541873be6d8a583f5e0cb6a0b8bb49e0437917799c1406da8e2200689e55e36",
+                        "s" : "0x4d5f10d446c658ada353cb9434c8441f58fb56049cf29c5951f451157bf92386",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d810g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d810g0v0Filler.json
new file mode 100644
index 000000000..0bdcd23b2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d810g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d810g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61032a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7c6587a5bba43016edecce9c7494ef358b4993cea9f5d97b723a7e981e46c8e2",
+                        "s" : "0x217f350724f257afd4a8a60f51a71d5d38258c19539cf5c2fa8173cb6c8accc5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d811g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d811g0v0Filler.json
new file mode 100644
index 000000000..5cd023ba3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d811g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d811g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61032b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8a716133771fad21620e8dfce5676914834ebe9e84898c2e9178324e83d4acc9",
+                        "s" : "0x339e3b958750fbd2fa244540dde82a385652632b785f4ca649edcd4a900cfcb6",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d812g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d812g0v0Filler.json
new file mode 100644
index 000000000..29e672a53
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d812g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d812g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61032c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe1b9d269d23fa8930dea60670cd14d009c36e0c2794e2619964df9a0315bbabb",
+                        "s" : "0x45ac28b348aca640590baf81dc71372dba7f9ada68886f4128b759aea7dd1854",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d813g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d813g0v0Filler.json
new file mode 100644
index 000000000..01d181dbe
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d813g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d813g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61032d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x81e7b9a98f57990e0f18999dec96257b235b831ac00b88c2e945314cea85dc8e",
+                        "s" : "0x4d9ff96fc3f6d0ea852c9b0c4812b271efb7882b8aa9e55dc619dd85c3219a8b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d814g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d814g0v0Filler.json
new file mode 100644
index 000000000..d548f5769
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d814g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d814g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61032e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb1e2deae7d3c7f9e562a5a0304a7b351b7543b67e897dc023a6d95afb782a126",
+                        "s" : "0x025e258822bb9b67f1e6326ca795158c47e009f8f4b2df6da28faee4aca1daa3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d815g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d815g0v0Filler.json
new file mode 100644
index 000000000..e02d0b18e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d815g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d815g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61032f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7ab9b3a5779042e8e2ccd556592cddb7eed284eefc0f79157fa29ef654a2c1a7",
+                        "s" : "0x0fda300d82db6151af250658cbd87708a776ef069b48188ecb6e6fe596f53ba4",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d816g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d816g0v0Filler.json
new file mode 100644
index 000000000..233baf727
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d816g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d816g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103306064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4778b4bb05a03ee7bfb0a1357055f757e4a3c7582c771aed3b96c78acd2dc8f5",
+                        "s" : "0x5766318ee603c4c584f9c8ed8f20ac8485bb3d2276f65bc7f63d6706325850e8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d817g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d817g0v0Filler.json
new file mode 100644
index 000000000..1994cea0f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d817g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d817g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103316064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1b8ded852187a2193737ab216bb555731801c1e1431c7708c646a3409f1bb220",
+                        "s" : "0x5723d9914e78f7695ca21d985ee4f4dbd3a699f687aeeb7ea6c16a073e741449",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d818g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d818g0v0Filler.json
new file mode 100644
index 000000000..8202f6337
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d818g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d818g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103326064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3c69f43e98284a79b0a74b666b776b7c95324f994f4b5c9cf40f246995164469",
+                        "s" : "0x191f9ac8b61599a4b544319df63bca0d4c3a8e57a4766b7ae02b58143bc279ae",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d819g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d819g0v0Filler.json
new file mode 100644
index 000000000..de4720da1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d819g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d819g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103336064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe4095dcb13a2bc565740a8ee2fd6100334797c96d5ee980799c87231dcfbae46",
+                        "s" : "0x2cae953f6369d158173bc7f80573fe81e04fcd149b6b7884da991b83cfb9b416",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d81g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d81g0v0Filler.json
new file mode 100644
index 000000000..5ca4ba604
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d81g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d81g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60516064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe13949007288be30d9d0bb868ea72f3c6666dc7804e079d8d57e36c3e39bbe6d",
+                        "s" : "0x7ebf2e8530a97db08f1a316f50736a47e8195b06140b2996625dd022689706ab",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d820g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d820g0v0Filler.json
new file mode 100644
index 000000000..f03a96499
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d820g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d820g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103346064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x67549c3e9794eea45de92bc92109268c02690265398e1ba759f27912ace55b8c",
+                        "s" : "0x1fdaf6b7839189702e7486963e7569705d89505e63ab121dc2ddf8604509ee65",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d821g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d821g0v0Filler.json
new file mode 100644
index 000000000..b1ea21a3a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d821g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d821g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103356064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc6b3b462a8ef3dd7945b28edfdf952891bda92a74ad93a6da15a882724508514",
+                        "s" : "0x1d9cb9a910bcb814be8724436461d70d7db699875604f4ed5362eaeaa17eef00",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d822g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d822g0v0Filler.json
new file mode 100644
index 000000000..9cea25e30
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d822g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d822g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103366064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x51e416707c7cf24a83457d2cb9674e1e6d5302b843ed11732f817df25ad941c0",
+                        "s" : "0x38247581081fe6d1414f507e6cadff439e169820b6a930b71944d75963ac9ddd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d823g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d823g0v0Filler.json
new file mode 100644
index 000000000..e7ff39962
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d823g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d823g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103376064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc75faab74ee0eac26d0bdb7fe938cc4015f99d8581494866da21a7c3994147b6",
+                        "s" : "0x7e3574db7ccf9c1e54f4136b71c753ed7fe25bba395b426a7fb6ba34cd0d7b0b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d824g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d824g0v0Filler.json
new file mode 100644
index 000000000..f7e1c51d3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d824g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d824g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103386064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x81705c601e8dcbb6ca034718e9f381cdf56d9964d6a894a10640980a5772ff1d",
+                        "s" : "0x77ce89a0880ffa69284923ab1a0b571b2705ecf6d38db3145a77ddd6afd7af3c",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d825g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d825g0v0Filler.json
new file mode 100644
index 000000000..493c6cd87
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d825g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d825g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103396064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0ed3dcbedf3947a981799549c9df7ee9e2315561c8baa6001986dedef89a999f",
+                        "s" : "0x723a14c545f1c9398720354d4669579803342391bed753007ebfa8682e3c9b5c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d826g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d826g0v0Filler.json
new file mode 100644
index 000000000..cbe0de869
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d826g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d826g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61033a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb48623c3303ae546d8eab5279662254e915668cb0be5cf6cffbb9df562fc03b0",
+                        "s" : "0x1d589b5f334da30d5595176bfad2a4704e2a4a835cec1e70d6598cd53ae5520c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d827g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d827g0v0Filler.json
new file mode 100644
index 000000000..b776c6851
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d827g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d827g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61033b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7f6bf0c8b51891c7957aae03ef0227ce786ce4e51dfdc71afe71beae96221a55",
+                        "s" : "0x15e1028f92386dc3b093676c70485254442c0b5bd58cb60aef69c28e5bfd2c56",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d828g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d828g0v0Filler.json
new file mode 100644
index 000000000..d7c2b322a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d828g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d828g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61033c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7a84f34d38f759166f6c30c3582cadcdab2c895c981ea69fdd28ae5fe7b04785",
+                        "s" : "0x03dfb5c96011c5d5eabb8b14184852ed80e816f50857ac997f06bb382fe07513",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d829g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d829g0v0Filler.json
new file mode 100644
index 000000000..d9951ef8a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d829g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d829g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61033d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8e72cc98975347845973108847739b24d176eda6b383538f51486557a1229871",
+                        "s" : "0x6fdbf41a660e8b3521e4a33577a08758679d225ad9bef7bed34e6cfeef2576cd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d82g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d82g0v0Filler.json
new file mode 100644
index 000000000..01e8e365a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d82g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d82g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60526064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x18073f274cd5a3c08cfbec3bb7d5406c2c7069e683a25adcd0b09773ca8cf37d",
+                        "s" : "0x50bb22692d0488d5b88e22e28a0d2676ac1a55b32ea837c6247c6820e52683dd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d830g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d830g0v0Filler.json
new file mode 100644
index 000000000..93656ce76
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d830g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d830g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61033e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x631003756cc5fbc6010349350ed435ceef0fa79ebfd6d9e74f5092c6c4aa463f",
+                        "s" : "0x442da9ab17a6118388caecc16f9c749ccd49b5beb95d037e5beb8d46195e367f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d831g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d831g0v0Filler.json
new file mode 100644
index 000000000..781036a22
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d831g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d831g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61033f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc444e1ba1ee4763e4e4d337797f32f02a81fd24baf708fa92ed7d0509c792b17",
+                        "s" : "0x7eddd465a59c28c68b5e2d55f661d6e863a9861b21cbea0444fdf4889ea717b9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d832g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d832g0v0Filler.json
new file mode 100644
index 000000000..3ad46ac7e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d832g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d832g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103406064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf325bc58be75c6b8086a3cfebbcb6527ee1a9d34e22a13121a9d674598b000a1",
+                        "s" : "0x75f9c07825900b44f6fa8af3e96f8cfcb016d0af3c27cbff0884878477410956",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d833g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d833g0v0Filler.json
new file mode 100644
index 000000000..2a11267c3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d833g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d833g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103416064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbd6a4c89dd9a4f8561f6c86af162cde52eeab85b89a0874301367e42adb2a06d",
+                        "s" : "0x638613f1d7e4485f73e59a322d23fa16abdd01fdf572f7a33b1cc4cbf30126c2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d834g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d834g0v0Filler.json
new file mode 100644
index 000000000..212425516
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d834g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d834g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103426064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6cd9a27bb07b28dcea96d008004a78eea7d9c5c02fcb5a305cccf6bd2daafd6c",
+                        "s" : "0x54603c5892cecdd2de559ad5150286fea7d56f6a81971cf8700f5a884b3c4baf",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d835g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d835g0v0Filler.json
new file mode 100644
index 000000000..119df190c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d835g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d835g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103436064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x01d4a6e83f3f01c1c7f21a9423199a1578db259ea467a95df3cd3b3cf77618dc",
+                        "s" : "0x66a73a1492cdb911b4ea844af6174ab3cd4bac8e433bae78450a1b33b2aabc38",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d836g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d836g0v0Filler.json
new file mode 100644
index 000000000..48532754a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d836g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d836g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103446064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8b48dd65fca37e05734ffa2edda553440be3a2fc40b24ca15ddea95d57457574",
+                        "s" : "0x3aaffe28a4638da2e21b2fbfb68eb5dfe382c5d25fcf3340f4aeeffeb4ca2e27",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d837g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d837g0v0Filler.json
new file mode 100644
index 000000000..22cbc08de
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d837g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d837g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103456064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc9e5e0a8abde0a02f8fc73aea9a9c0b731a4f8866a0c1915b616738788c7e969",
+                        "s" : "0x2675f90aa02b8ccfe24d55bf937d87a3b183468b64731efcedabf8245e228d6a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d838g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d838g0v0Filler.json
new file mode 100644
index 000000000..bf05310eb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d838g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d838g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103466064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7cc811ab9b57d7ce331867740f6f531df707710608a6c7be852f57fb7c89f3f3",
+                        "s" : "0x2b9c73c6ca9ad591496c39ab8be87c410a680dddf0bac7766187ea7d63cb40e9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d839g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d839g0v0Filler.json
new file mode 100644
index 000000000..44ece8f5f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d839g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d839g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103476064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb3b29401a991f88a77435e17ad2b912a4a0a8a1c9531acc3f120cf1bec15952b",
+                        "s" : "0x7052862ab22e480b1012a92e4cbea1a5e7ef3867928eca3aa0242f5bbc87cf69",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d83g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d83g0v0Filler.json
new file mode 100644
index 000000000..7d4262915
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d83g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d83g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60536064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7b9222fd5020c20c1f83c8d7fdddb90ab720cb5c720e69e35b15bc3eb6cba396",
+                        "s" : "0x126a6a0f854ca870b079a230bd0e936421c783135dc054bd61971109f8b76d1f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d840g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d840g0v0Filler.json
new file mode 100644
index 000000000..07a3c1106
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d840g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d840g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103486064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1262fa833da9db27b6f8f90c8260e77f26a3e3329f2a5f8fea3aea01cc3bcc2f",
+                        "s" : "0x4766fcc06970ced0b797c7b832d701aa7108b3b1114026dddd7cb10ac7904dc9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d841g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d841g0v0Filler.json
new file mode 100644
index 000000000..10f1af265
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d841g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d841g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103496064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc44f6ca53712340b64a5b08d60f0d4dcf96597ecafbc138f288ca46a7cf8a51d",
+                        "s" : "0x06ae39aa4126ed5178ae1e1d0d72b4e439462a898d4cca0ab6806c553e540bcd",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d842g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d842g0v0Filler.json
new file mode 100644
index 000000000..d0f77be1a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d842g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d842g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61034a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8420e128316bf1dbc4b2ca5d1ab13f2b5a9064e726eacc659d17bf29418a3f8f",
+                        "s" : "0x5d3e96aa1155756a533e9eb7e19d955740af515f037d58e1c8728e7f9a720810",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d843g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d843g0v0Filler.json
new file mode 100644
index 000000000..d3bc921c5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d843g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d843g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61034b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1439e03f320c1dbc5ca6403fabb0a691b256099059c00a6d77c237b794248b12",
+                        "s" : "0x4ac99ec734be2401675b4af3493c91c7121a00769e497cc648a0da7ef4b3a90d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d844g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d844g0v0Filler.json
new file mode 100644
index 000000000..ae3a1a4b9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d844g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d844g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61034c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5496b26f60dd1deb9518b65dc28e72a9ad75a7e14749b5f3cf388895321d9e80",
+                        "s" : "0x4253fdd75ab1472b562fa4941cbcae60b6a50bce19ad4cc1ba6337f6484b6894",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d845g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d845g0v0Filler.json
new file mode 100644
index 000000000..0ac02755d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d845g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d845g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61034d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x43f771e3c429ef1712a4a1b263528a108cc22f6715c544291c11d7fc88ebe9cb",
+                        "s" : "0x096cb1282d750242fc945255684834e9cb85395bba7d0aece795a23a42bae2ff",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d846g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d846g0v0Filler.json
new file mode 100644
index 000000000..248b7d71a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d846g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d846g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61034e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb0084df55daadde387bd8e8fad4b756fe8518dd82ce536efba95a3c0fdab2c4e",
+                        "s" : "0x575e7cfd4389d6cca9fae8f48869874cb5602b27114aca50d998f0285454f1a7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d847g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d847g0v0Filler.json
new file mode 100644
index 000000000..179a74364
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d847g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d847g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61034f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaec3a6cb6c4d94fe7a10377d9fd1dd977e11a1c83548080fa09304cc557b801d",
+                        "s" : "0x0cb338b1deef7d565968ba9d546873ef9efc137bb537c5d22f69e644be2dd6d9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d848g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d848g0v0Filler.json
new file mode 100644
index 000000000..f5129375f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d848g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d848g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103506064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfecf8b5b336248158cf9f51d3fa6f3110cce83b83ed315aa2624aa514b5bb74e",
+                        "s" : "0x36a04fd21b1d635d7cdc536afb6d50ec35635e868233e3578d370b5571dd6cef",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d849g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d849g0v0Filler.json
new file mode 100644
index 000000000..416f47e7d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d849g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d849g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103516064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc3bcabe0bd2ad11279207245d2e66c4d034b01b590da8395e20261fd87b3ef92",
+                        "s" : "0x27084f28b0698ed43d994be907a5926695e1a01ce5a6d53c592e051d41067975",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d84g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d84g0v0Filler.json
new file mode 100644
index 000000000..3732e6855
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d84g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d84g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60546064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f1506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xed261f823d18bcf7bcdd846736729e227d00004fc1c3a2077850df4ed0653253",
+                        "s" : "0x0dc630f9a79a1a9ea1ee8eb6b091e054b87743fa6a4f46f779d82ec58337052a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d850g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d850g0v0Filler.json
new file mode 100644
index 000000000..af338c07f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d850g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d850g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103526064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9e2e70406291ba3caf9de1adca41532678f83d8f059cfaa0dde7c300bd29ac25",
+                        "s" : "0x73b100a8da74272c646d8cdd72feaac3495fcb90a23e56f56583fd0b6fb4be48",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d851g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d851g0v0Filler.json
new file mode 100644
index 000000000..31676729d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d851g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d851g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103536064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x84708c8da86f521a182f3603595684672c9eb3f12a1b85e3e99f39c328249a63",
+                        "s" : "0x6de25301b54f73752a973b6228d8585da4113d3acd3b2cc9b63c15a7d46077c0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d852g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d852g0v0Filler.json
new file mode 100644
index 000000000..2072d872a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d852g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d852g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103546064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f2506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x27c976cb76415bbfd10efef76827013d02d36841789b46c9c37b85b0fe4e22f3",
+                        "s" : "0x14c04148ac3960063639f015b97099bf619915f05667653a5a2d570442547794",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d853g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d853g0v0Filler.json
new file mode 100644
index 000000000..cc6e7564a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d853g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d853g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103556064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa3ccc0abcaf202f6a4477b652df626ae73dd56e00f853addf3c0d445520112c8",
+                        "s" : "0x4d7b2d91e92039c8f23c3c1ce1d68827f7bb0118e6453e9c17466c07d62ec087",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d854g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d854g0v0Filler.json
new file mode 100644
index 000000000..f856a92b8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d854g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d854g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103566064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x42ab125657197aae8d7da8cd8a02c3b30781e2505b3ae0bbb5bd801c18cd3e99",
+                        "s" : "0x5addc16d723f822223fb140336bfcf0cbce5ac00b215a9d88744ea1a4b393f77",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d855g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d855g0v0Filler.json
new file mode 100644
index 000000000..18ffcc1bd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d855g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d855g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103576064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9ea336bd34d16fe06014ad72c7a3230ef966cb6acc4a6b221c9b9c82dcd65e05",
+                        "s" : "0x01c85559ab85e53e7f476a0aa2ce236b97be717f3288305e55d3edb97c674acf",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d856g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d856g0v0Filler.json
new file mode 100644
index 000000000..35b174669
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d856g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d856g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103586064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5cb033c0aeaaa7415959a7c46788159aa729e16ec94734f7f9452cccddeb319c",
+                        "s" : "0x7a5e977b72de8e7b77a6155a113fc740d5830c0e645d81bc62ee927843d22189",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d857g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d857g0v0Filler.json
new file mode 100644
index 000000000..cca3b500a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d857g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d857g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103596064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8987162059a3d172b123c91967e7afc70fb017f4a08ea6f1416b3bb116544dd4",
+                        "s" : "0x0f457cd8754765a8f5033aa85a3f83421f0836acf7b5b6de4a5570d47f1cd2a1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d858g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d858g0v0Filler.json
new file mode 100644
index 000000000..cdc5e7461
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d858g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d858g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61035a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc62b269a5c7469dd53c4bf660ac1fc45c7629842a4b97ac19ea0d9f502f1868e",
+                        "s" : "0x64fb15145bbe6e1e5c61bd3c78882fb4b2dc552bfb796746c628f959880763ee",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d859g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d859g0v0Filler.json
new file mode 100644
index 000000000..31b25ef75
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d859g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d859g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61035b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x074c4f075b85c69cee5315752a2d1fabb7e203184567b09336b2da926607902c",
+                        "s" : "0x4b6dcf4de6874f88004125f83f854b0ce89126c2bc1744713ea1c6eac8205c61",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d85g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d85g0v0Filler.json
new file mode 100644
index 000000000..f4cb2be56
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d85g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d85g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60556064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0d40e4f0cee9a6aa1a054381c0f95d8e35e3c41da5ccf9e0201a10ec0af5e5e8",
+                        "s" : "0x3c6084152175d3662a72ee1a60646630f07dc45af283ea59a3e9265cc5984989",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d860g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d860g0v0Filler.json
new file mode 100644
index 000000000..283f5bf46
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d860g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d860g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61035c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x111608f01859487952d4e91ad4129bc0a80075485ed1194c7ffae5f6fc82f7a7",
+                        "s" : "0x4651addc89442f55cb5253528a2ab9967fbd4f9b64ccf75aaa08f2ba22c655f3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d861g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d861g0v0Filler.json
new file mode 100644
index 000000000..59f2301c5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d861g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d861g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61035d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x477c7f00fa2f143e34ea93a53075020c73ce95b258d97caae95f0e92b2cea132",
+                        "s" : "0xbc35e57a8997ddf0c15501441e037e9094c439564320bf8326f46bc535f68c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d862g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d862g0v0Filler.json
new file mode 100644
index 000000000..5bb6d0697
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d862g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d862g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61035e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5ab1ce6e6f92fc24b53c077af08d6520ed04c1479f51408b9c3bfa486f02d2a8",
+                        "s" : "0x72d38166f8e72bcc9eda7f2850e76448f92acf5f832a3f565eaab4504e1607cf",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d863g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d863g0v0Filler.json
new file mode 100644
index 000000000..1aeb2d039
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d863g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d863g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61035f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xaf07966bd333fe0c8cf3a8a0896fd676cf810eaabbebda26bbc7a16aa64f2c48",
+                        "s" : "0x25301090abd36ee919866f11d2b51fa33f50eee87efdeae24da86cae5c9e396e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d864g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d864g0v0Filler.json
new file mode 100644
index 000000000..1a67161fe
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d864g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d864g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103606064526000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f250600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb5711e5e3ec98485dd3e00cd62eed0f6339a3b1eeaf8413fdd9fdacb6d69fd50",
+                        "s" : "0x5634023aaae025175705759d25dbf9f7fc22e27538d78e3495cde8b3f14c85e2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d865g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d865g0v0Filler.json
new file mode 100644
index 000000000..6990122b6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d865g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d865g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103616064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb81f96f75803d780a734f1849dab705c1dc63fbf44ade6b333ccb1c79e2d8ea8",
+                        "s" : "0x09d50c240fbf2061d8927c79ce6835fd661e073596b42c241e282b135c84eb97",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d866g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d866g0v0Filler.json
new file mode 100644
index 000000000..00b3a3a9a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d866g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d866g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103626064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4b91fc506a39465f283065320e890bdb2ddf38700f2f422e6592d44f495185e0",
+                        "s" : "0x3caae738f17123e8252c9374d9416cb3b6191a9bf44016e51cc8203370c229fa",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d867g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d867g0v0Filler.json
new file mode 100644
index 000000000..e4671e300
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d867g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d867g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103636064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4c8ede163a8350bbce3aa4b045d05cf4c320218207cc4a2699621f7804eaaf36",
+                        "s" : "0x49f93f7f257c79a33254587aac7e971bb953bbf1ebd8c680ae846b8640356e5e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d868g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d868g0v0Filler.json
new file mode 100644
index 000000000..30b46ce39
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d868g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d868g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103646064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x13028d44ace596091783e1d8b9e879da2bb00c59fc0056ced65c1ab6a12480e7",
+                        "s" : "0x302af8ce4204e2bee6d6e3eb751fc45a9c110ee02557e238213766bb7ea5d33e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d869g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d869g0v0Filler.json
new file mode 100644
index 000000000..75ee83cb2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d869g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d869g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103656064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0f5fca6586ae8e399859977a1d65c470774762b59facac5f268971fd976f0208",
+                        "s" : "0x1b3644de368c1a96f7bc8e12766d554fb43e3f46fb01304b0514ce9074fc4185",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d86g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d86g0v0Filler.json
new file mode 100644
index 000000000..eb454e5b3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d86g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d86g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60566064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1566c37122a0224fdffc710520f15e0e7cdf32f9fe6bbac7b7d0ada3725a61f2",
+                        "s" : "0x30c015edc04391d008180fdc1413fde1ba1bd3e40041b38e67b5f1db14ec6ff1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d870g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d870g0v0Filler.json
new file mode 100644
index 000000000..4ca36d75d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d870g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d870g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103666064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x609c2fa226961a794352b7cfe83a65bfcf3d5da054d0389cbd713f0c5ba46cda",
+                        "s" : "0x18ee673dedcce4de33b02eb81a4322a1218e5e8c84e1c1155bf8e67e2454ff73",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d871g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d871g0v0Filler.json
new file mode 100644
index 000000000..9a1f4a4ce
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d871g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d871g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103676064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2f34e319aed4cb3aac170a8a528c6046e9929b0f51a321cc026f651769d39d34",
+                        "s" : "0x48a32a49cc21446791570ae5ce6a7138da2048e2ebcd6d8acfda49d0b24961a8",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d872g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d872g0v0Filler.json
new file mode 100644
index 000000000..663506d3f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d872g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d872g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103686064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa40c23c0c041e09f50098fddfcd550e2dd57fe30e4f4e5486df103fb5c4624a0",
+                        "s" : "0x797c8ebc719d1983f516a8751d57e0bb7ac3229b8752b5d1effcee02aa10cba3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d873g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d873g0v0Filler.json
new file mode 100644
index 000000000..76bbfa88c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d873g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d873g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103696064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4e1160edb9853726d3bd64d6e4860378d4a8ee7e7350eac8b69fbf5a35f668da",
+                        "s" : "0x467b8ee5d34b543acbbd1273511c41fc5d9fc7cb2f41ccc4cf5bd286127a5cff",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d874g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d874g0v0Filler.json
new file mode 100644
index 000000000..e71801336
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d874g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d874g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61036a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf9ba9104ba4cfebb349403a645c1e80ca1f43ca4041b4b7f83e3ff97c1adf36f",
+                        "s" : "0x2f55799c85413c71eaca5525d602f323d217aff7d43fe7ea4566a8e7181c5935",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d875g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d875g0v0Filler.json
new file mode 100644
index 000000000..91dd9ae8f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d875g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d875g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61036b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x114469561707b9c01cbbdfaf4fa5ee50945c21bf7064527e610adff9677bf66a",
+                        "s" : "0x39ff09918d59b5d7df09de98cf97e19e98ff9473d48dc29634fdf5f8a0d90284",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d876g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d876g0v0Filler.json
new file mode 100644
index 000000000..5be37e3b6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d876g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d876g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61036c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfff9f62306a0ca2cab135c475635070eec82366ee2a0b4ff57eeaeef0083271b",
+                        "s" : "0x5af49cefff275b9cdc873a07b3d16caa407f2e73d1a3577509ed68e963aaba5c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d877g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d877g0v0Filler.json
new file mode 100644
index 000000000..1e2e4a213
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d877g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d877g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61036d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9944362bbf819d58e564cbbe2fdfed9bd46a51afc078d1e187af240beb4463f9",
+                        "s" : "0x2d1b5a2a5b22f829fb0d06396bf127659953596d17b3dfb9b2bf88911d6bb641",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d878g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d878g0v0Filler.json
new file mode 100644
index 000000000..b34e5a739
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d878g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d878g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61036e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1fabd371e59176668a34e09eac119b18e4cfe2f6a35710be44d69241a868ee59",
+                        "s" : "0x10c8acb7ac311082639e9cf88415ef8a7719802987400b1ad39bbb11f87d3cfb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d879g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d879g0v0Filler.json
new file mode 100644
index 000000000..dd7accc28
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d879g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d879g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61036f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7c01109b0210b558c2031bcfec52c85dc7591ef917b5d65626528ef0d8fc6f9f",
+                        "s" : "0x5d0813772ad11f675343ae71c549f0057552f45367b023467e232bd8c93f2daf",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d87g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d87g0v0Filler.json
new file mode 100644
index 000000000..0bddd9adf
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d87g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d87g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60576064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6e003bff26bc1cb3321369f3796d1fb45a943353d921cb92aa3a0fe64c712585",
+                        "s" : "0x733400edd22e5f3e546d7ed39bb554acf30cd939fbf79b0f1d71dabbdb4c355f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d880g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d880g0v0Filler.json
new file mode 100644
index 000000000..44b8afb2f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d880g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d880g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103706064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x91cf42d5c944b562558e8f06dc02fbd14aa4cd8f0a353feed7bf0bc8d7768ab8",
+                        "s" : "0x354fa7f38edc9f1a509ad8e8487c743baa0fab56701602df5b5e618a69163241",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d881g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d881g0v0Filler.json
new file mode 100644
index 000000000..f839bbab0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d881g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d881g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103716064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc6fb62010e5136400b6649727da60af2c07ce04643f635835e29ba361658788f",
+                        "s" : "0x57bfb44f37a86b6fb42f0d83ae5fdf7af99fa9363ccd4a2e3f84df8b2c6ccaf5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d882g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d882g0v0Filler.json
new file mode 100644
index 000000000..3e0962c20
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d882g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d882g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103726064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8f70e6eab2dc2eeda376a8721a4291f7294c1106fa3457b39d491feb1148a492",
+                        "s" : "0x14ef4d29aa6c8892b07dcdaeea4a09075c907090a202bfd52252a42025ee2d06",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d883g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d883g0v0Filler.json
new file mode 100644
index 000000000..2e88196f4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d883g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d883g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103736064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x36e06c4721b9cf5208ec15e08e0a5c992a956058fe7be89482a9d47deebc9bd7",
+                        "s" : "0x0d3e1a381d41f1a786575797d603f58fe3173de90bf96f438c5dab986780b156",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d884g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d884g0v0Filler.json
new file mode 100644
index 000000000..ef7989685
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d884g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d884g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103746064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x89bede52c1a05b5b0da47b6a362ace9e5d40236d4f93fb8c5465ff9f50a774cc",
+                        "s" : "0x05918edd7c018008b3980709a3bce0c467a9a52a6a7e70e4dc63b3e1a705bc44",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d885g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d885g0v0Filler.json
new file mode 100644
index 000000000..e9cd3d1db
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d885g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d885g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103756064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd49c768b66db106cbdc965e17fb135baab99279e5ed664e015946a797ce566ef",
+                        "s" : "0x2b59406692646bce13c10645ce4d99e1f2fa9a3b4af9c9a133e5f3d1e9753c19",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d886g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d886g0v0Filler.json
new file mode 100644
index 000000000..96cbd81c6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d886g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d886g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103766064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb0b900c5a381b27318dd55123a52c7c149452141b4b30608ffafbc7acffb5fee",
+                        "s" : "0x2961e7d5a65e7748363114d6df5e32fb263b9f1e1ce82fddbdc686a065ad17f9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d887g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d887g0v0Filler.json
new file mode 100644
index 000000000..e13a237b6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d887g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d887g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103776064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9402a477fed56b2378f1801d239c1522fa0a5f33caa7e924741c1961d21bc254",
+                        "s" : "0x36eda15beb3b1eee0f569db9e9507b150acac05530fc36a10ccfef4542d68e40",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d888g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d888g0v0Filler.json
new file mode 100644
index 000000000..bf4c48638
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d888g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d888g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103786064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xca3787cf3aa9974eb68555a8e6047c38db97aa8f6628557c7001e0d5daaebb6f",
+                        "s" : "0x532b2a1030c524d11156a8d1cbe340fc2ec54832cfdbb2d0a5d49f35c4d150e2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d889g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d889g0v0Filler.json
new file mode 100644
index 000000000..f772364f5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d889g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d889g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103796064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4d4ce620e8ab71963f8bf7c966c9e04672aeef60937acd05c621e229d186c232",
+                        "s" : "0x2acb8f22f6f070ed5ee193b385c30b3cce2d550834641a64e4a46aba3dbd6cdf",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d88g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d88g0v0Filler.json
new file mode 100644
index 000000000..6442e72c3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d88g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d88g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60586064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe25acf0a9a2f0c3c1a139d3f602df080b388f5be21086ab5b6e44a7e76172317",
+                        "s" : "0x499614a7cce825e3242ddb76bc4f93b33b78f1fd2c63ee2e91f73292291c47a5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d890g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d890g0v0Filler.json
new file mode 100644
index 000000000..36a12b1d1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d890g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d890g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61037a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x818c59deaf4da01baa477898c22c6ad07870aa363dd7c26dd099bc535f5d9a7c",
+                        "s" : "0x3e944f959d4282ec7e0e823e463d98959a0b9251dc83d6bd0a17a8d90f86a6b9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d891g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d891g0v0Filler.json
new file mode 100644
index 000000000..c4d90ddf5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d891g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d891g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61037b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2e58415ce3759e36d09dd02d83f3df72db36d63bdf48bc88a641cf99e4e892",
+                        "s" : "0x60634063aafaadfed08925916924de40c4c3e2a3ceb75688c9f96d8fade673a6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d892g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d892g0v0Filler.json
new file mode 100644
index 000000000..286ea2401
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d892g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d892g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61037c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8e9ccc0cc00ef8925a5067a996ab06aef1a6bc5101dc51c72c2df24872344d1f",
+                        "s" : "0x0c7cb6353e19cc8e00b327599e95003dc3039ad07ae0a2ce58fdef44cff9400b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d893g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d893g0v0Filler.json
new file mode 100644
index 000000000..d8fd790c9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d893g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d893g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61037d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xee51f0e5a9f6ec6ed6b6eb542dcec373a2493959c1182323d528c6636679fd04",
+                        "s" : "0x227bc26d4c2b4d206cc2c87cda3af5cdf79e4a2dcb23ec84d69b0f8f7c5cb2b3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d894g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d894g0v0Filler.json
new file mode 100644
index 000000000..f239e94ed
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d894g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d894g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61037e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1cdafa8fc67bdea630f11999adb36090268b86951cb1b4da0bd87bf9af810a8b",
+                        "s" : "0x29378dfde49e1081cc73b592e12d06b00cd1c7b69d368df07f0cc2e85ba95469",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d895g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d895g0v0Filler.json
new file mode 100644
index 000000000..b891140c7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d895g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d895g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61037f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x814663658001efc31b58681918171ee86f1e0469e0de60a12cacf09454a98fc3",
+                        "s" : "0x147127b080dcd3d6fc0fb01d9f4e61b03369703317d3161733455b19c3ff0893",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d896g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d896g0v0Filler.json
new file mode 100644
index 000000000..45d572cea
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d896g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d896g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103806064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2b2cd0cd85fa9b45f0a6ccb85172c74ae5e33fb4f8fbcab5eb278c868c6d64d6",
+                        "s" : "0x4ea20c8d89af492808d2af84ba561a18a1d8301e33922ca33c5424665b0f6c8d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d897g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d897g0v0Filler.json
new file mode 100644
index 000000000..3e2834482
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d897g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d897g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103816064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa889e4164329db5935284d3dfd34ce9eb479ac8025c1d40c1a2e2e7316bf04f5",
+                        "s" : "0x4dcfa240271f7a9bf835127a17f550788481ce7a89dc8e9e005af0e2d611aeb2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d898g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d898g0v0Filler.json
new file mode 100644
index 000000000..659284bdf
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d898g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d898g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103826064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x34ddc9c7e5bf5b825687ef92bb1c8e2bd53087f73d62b6bb56f1f373a6384f19",
+                        "s" : "0x0df39ba0d8dce0cdd1a22434da3eeb6aabdd31bc3e751f4433c21bf5efdc585a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d899g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d899g0v0Filler.json
new file mode 100644
index 000000000..d1a53bc14
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d899g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d899g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103836064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa3d3c9bacd90ac4604f03da612662ef4c792caa9b519e3bd59b438c8cdf9a442",
+                        "s" : "0x3be53e8e54b7b38200fd902d317098dd0c2a4b3f7c142fa1c0abb3baf2401289",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d89g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d89g0v0Filler.json
new file mode 100644
index 000000000..d7662857d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d89g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d89g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60596064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf8820e4ef2a29b155fb63bb5bcd11f73f8f726ccc45c802fea74a9086303aab9",
+                        "s" : "0x781c19aad726cfb222c8749861eabf7d64da0e5a95850e9296da861e94964290",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d8g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d8g0v0Filler.json
new file mode 100644
index 000000000..fd375fa33
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d8g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d8g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60086064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd9b0a62f59acfb0931761b4d307403fa610c7eb49870ba22bb3bb70d2a100908",
+                        "s" : "0x02fb85d4ee2c4f8d0b86bd477efaff0285116e9051b49ae1327e67c3aaa1580b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d900g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d900g0v0Filler.json
new file mode 100644
index 000000000..9160a9ad0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d900g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d900g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103846064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1a87c7ad1b559d957e31175906d8d50cf3048e9582530368b8f32de4ccebde85",
+                        "s" : "0x1af647dbb8d97989f8ac82b81170004abb10ee46c26fc2f87f70dcebd1cb2c08",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d901g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d901g0v0Filler.json
new file mode 100644
index 000000000..91346e6e6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d901g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d901g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103856064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbdc2ab2d63ebb46a3f2468e855e109f06b2680e4685cd00bb1fbcaf406fc70aa",
+                        "s" : "0x2a1c0a41903878eeb837f607f05610fd94f655fed53911258aa6caedd09f46e2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d902g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d902g0v0Filler.json
new file mode 100644
index 000000000..8de03660e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d902g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d902g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103866064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc7a2b19a952e223958f529d4028c8d0d709a84933462a5f5efcdc80f0a2fffba",
+                        "s" : "0x08140dc1b85182e146d16fc2540407534818e56f31e3642efeeb989a595589a1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d903g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d903g0v0Filler.json
new file mode 100644
index 000000000..e0538d92c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d903g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d903g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103876064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xff6cbb58cfcaf511472b5fceeb270cd042339f56e86a34e61749dc3f32530799",
+                        "s" : "0x010fa740687cbefeffbf31891a423bab05c0b0a667f1049af816ee2589def65c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d904g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d904g0v0Filler.json
new file mode 100644
index 000000000..7b7812da7
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d904g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d904g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103886064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xca0e9a40e9bda17c07e864ea6c76bb5a3b756e56417cccbf56f26adbc41a6362",
+                        "s" : "0x245c7e849529818635edc71dd4a3c2bd88d599eea2bfe31265efd9bfcb0ffb4a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d905g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d905g0v0Filler.json
new file mode 100644
index 000000000..a019e6fc4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d905g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d905g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103896064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x95db70d60068df0ba3ebd945471e28e3ce3c82162a5c3fdb4613c316a8a1eecb",
+                        "s" : "0x33f9c97f0b2bf10658829407e2f523b4ab2f4931e423eacec7431631700e5de3",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d906g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d906g0v0Filler.json
new file mode 100644
index 000000000..015deb563
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d906g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d906g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61038a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5ab7ea188aae21f456e9d8266da449af4efabc5a6ea14df17c71109e0be41a88",
+                        "s" : "0x30c5e2afd3d8771dd561e75bbe27a956a3f9a53b55a92458e774c5fadcdf1fef",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d907g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d907g0v0Filler.json
new file mode 100644
index 000000000..d89a14297
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d907g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d907g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61038b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf6ace980c854e2fc3d1710fa02f29a912b594c73441d2894043ac4fb787c2842",
+                        "s" : "0x0a1d85091d5fa1ecfd23cf9d184e1217968916f7b54759fda2f37c3a51697fdd",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d908g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d908g0v0Filler.json
new file mode 100644
index 000000000..581a03015
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d908g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d908g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61038c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc1c7b653c8c7239aded04af77a0b5dadf2ec00de062ebfa009164bd7b32b5a20",
+                        "s" : "0x59408c1cb5a79f2f7cb6fa619585316954c0763a184733041a6c3fad0deca9c5",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d909g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d909g0v0Filler.json
new file mode 100644
index 000000000..9c7d343fb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d909g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d909g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61038d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5078c2b2d5c081ed32065cf9d7e66936932b5e0bd2a0478fbeebe33e6a1f2d70",
+                        "s" : "0x47f16ff34d43eafea290a3e39b884921f683e076dbb7d30b0e77cd7044d5cb78",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d90g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d90g0v0Filler.json
new file mode 100644
index 000000000..af5616844
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d90g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d90g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x605a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9e3928d37dae1bc26bd0168f57129ac3abbab5287d3d1a634f9c611cf3913a36",
+                        "s" : "0x2a2e21697f4a819f2a9ceb487497e4d9ba81dfd2e86fa9280c21c2702f4161cf",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d910g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d910g0v0Filler.json
new file mode 100644
index 000000000..e8290eb9e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d910g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d910g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61038e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc44394377ca9a4b42959409617772ebc4bfa7c79469a4d9c6e663f1605999da2",
+                        "s" : "0x3b6d009f4f6f0aa2d09a129f955fd460abd8e5dc9721e94e20defbf1c37838a4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d911g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d911g0v0Filler.json
new file mode 100644
index 000000000..0f0031303
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d911g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d911g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61038f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x31714488cb5df6b7e7f8ffe527fc1acc3bbac26c2b6009176fb5bb9a957fbb72",
+                        "s" : "0x60abd11a0825a3e01c424d3f53a4f7b4e8f02f53016ee3c0426ff734aee835ab",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d912g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d912g0v0Filler.json
new file mode 100644
index 000000000..ef6ec3a4b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d912g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d912g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103906064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3fb8e5cb7d44dcd0d59e4a2a3068ed37044e94e3b1c560090aaa112f1c1a5356",
+                        "s" : "0x4cfa007fdcf8c9d7cb0fdda904329daed594387db1d308f7cd411a093626372a",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d913g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d913g0v0Filler.json
new file mode 100644
index 000000000..9b8b468f4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d913g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d913g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103916064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbae01d598c42068f6dc98ebb755e3f13fb9446daae16d070e1b6884caf0858cf",
+                        "s" : "0x66e22a709fadd82292baa2c3b7b6afab5f2395e33a0aa1bfde49514b4e313285",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d914g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d914g0v0Filler.json
new file mode 100644
index 000000000..9f6d3f496
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d914g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d914g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103926064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb48f74b763916552be9f72617ab3fd1d6e7c7df0fd5aa57bea18388f0ecd4f75",
+                        "s" : "0x5dbb553544a012cd2904a23bcb7c5683a8eb34104caff675456129e3325f2616",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d915g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d915g0v0Filler.json
new file mode 100644
index 000000000..7a229452c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d915g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d915g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103936064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdbe7fb5e49b6d9ee9b6d94442f4ed8c6402cee98f85f8eb30de93ee7a3a0cff9",
+                        "s" : "0x263c6006062ba255fcaeafb314ba24a8b01e6fb1e0e11531106c26d76412703b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d916g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d916g0v0Filler.json
new file mode 100644
index 000000000..d247fef41
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d916g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d916g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103946064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1aadb009c526593042d2fed34029ac7ef544849e52c6e9cf40a01ef01e2d0fa5",
+                        "s" : "0x760d2d94dccc53a9f29ff20feb9170fa34508b3ceda286322c492a50a12590f2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d917g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d917g0v0Filler.json
new file mode 100644
index 000000000..beccefb0b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d917g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d917g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103956064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbe15d30412980d1c1885b4bf17b2753127560ab5c7bfe118ef3c80b41e86c53d",
+                        "s" : "0x4241740dff729630d89287f821544b807d18542f3ec68909de84eb92b41426e4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d918g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d918g0v0Filler.json
new file mode 100644
index 000000000..e601af659
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d918g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d918g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103966064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xde6566b74302c9a4a121de4f94cb4ed5046ad29cb17ba894184b767a7e1b8665",
+                        "s" : "0x4fb800c9d7c499beb6a6fd0b321191f14374e13bbd68f0e92c42eb7816200898",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d919g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d919g0v0Filler.json
new file mode 100644
index 000000000..545f4193d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d919g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d919g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103976064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc47f48c517d9a23a2a717b901c4c52276aa086c4b266d790c5fd979d8a2f985f",
+                        "s" : "0x5376fedee332d3df5146fb97bb6af456613d1225fd06fc2b7d394dd4482f74b1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d91g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d91g0v0Filler.json
new file mode 100644
index 000000000..1cb138995
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d91g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d91g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x605b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd59dde1aeff131310efd37d1d6addede3aa5072c4868947145785c1e66495144",
+                        "s" : "0x79cb0eafd11fa75f69ae55c4b8581465fce9463549a3d6dbf7fd72279143a777",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d920g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d920g0v0Filler.json
new file mode 100644
index 000000000..4850f952b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d920g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d920g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103986064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1578a4054698b14e7d26797e5d49ee9f04e73fc114fba79282477254ebedd331",
+                        "s" : "0x6073fb9e001adc284df31ff28a35bda218dd6a6c882f8d4e321d60d14522bfe4",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d921g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d921g0v0Filler.json
new file mode 100644
index 000000000..d9ac3a795
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d921g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d921g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103996064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbcd3e4239e0aa98670fa40eb8a12bcfc5c75b3299a69b85e0d306e16aed02937",
+                        "s" : "0x20ebe89e03a54d532341d2cc64a2daf05a5967abf4919799a7a0901c6fe8ed5c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d922g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d922g0v0Filler.json
new file mode 100644
index 000000000..ee01389a6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d922g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d922g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61039a6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe17969fc486ddf86c0ec7ec7a82d905c2aa9f117af428da26eef5ae3623657a0",
+                        "s" : "0x59757bbd8c6e037117187529f4caf23bed4086c437def8de20ac68db3ec65b78",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d923g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d923g0v0Filler.json
new file mode 100644
index 000000000..e0e9102d4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d923g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d923g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61039b6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x95da927388cdf3c2b532c6624d02de1da3fbddd7d786e718db19b372b9809b60",
+                        "s" : "0x2de7570617b4c33e1179a9629f50339e906228a9d2ffc73b78cdd1a0b85679c2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d924g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d924g0v0Filler.json
new file mode 100644
index 000000000..73cff2e6f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d924g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d924g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61039c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0f6933f1742cc943cb17d08923c73dcfa83d2b61380b30b2f771e277377905",
+                        "s" : "0x3c45d246a803da07a92cdc44cbab15253b871972947dc3d20be2802f9761e7e5",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d925g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d925g0v0Filler.json
new file mode 100644
index 000000000..aa09e433c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d925g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d925g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61039d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xce826a677f0a74cae15c402d444ce5e74f8f281e2ec326c5a674481848ba2d50",
+                        "s" : "0x2ca81329a430e5855bf5249bd5600bfbb8895956acbd3e5d9924410e6ccfdaff",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d926g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d926g0v0Filler.json
new file mode 100644
index 000000000..4a9b4e451
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d926g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d926g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61039e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb3701dd0b226d855ad1ffdda4086a94564c1424979eb9be92d90eb88d9d07a9b",
+                        "s" : "0x28cce9b2a39849cbb78b1a249cffa23a70976fdfb4bc6335a638a595239ae0a3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d927g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d927g0v0Filler.json
new file mode 100644
index 000000000..a968ddc3f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d927g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d927g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x61039f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8176858bbf6e7ff3213df9ee83d94e876c90126783ae41a798a129cdc68813a3",
+                        "s" : "0x27bae9c085f8f9c558c79e06b4029be1d940c10c92d609e37d144796bae7cc25",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d928g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d928g0v0Filler.json
new file mode 100644
index 000000000..8e706050b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d928g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d928g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103a06064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc4f7d074dca20a02c5b721bf25a491704fd0a89391ddcda3b23d2b9410d3a1fe",
+                        "s" : "0x3932a181bbf075dffd3ec306a329e12680889edd92d104a1df84466753cafbef",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d929g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d929g0v0Filler.json
new file mode 100644
index 000000000..62f03e286
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d929g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d929g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103a16064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2e3644fad0660035436f9277dceccd483957171cda22a9e997aaf06dc77bbeec",
+                        "s" : "0x35123fbc3de2d96671e39d77baf2b7bdf113b3b676189b7a3f0a517ccc767a79",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d92g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d92g0v0Filler.json
new file mode 100644
index 000000000..60a57ff6a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d92g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d92g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x605c6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x29d7462bbbaf5ca15d2e325afcfddcb85fc2e34086c2bc36de000429b1469e5e",
+                        "s" : "0x6730e1f4efd9fb8b0291461351b4ab37a96fdc11734d4c6acbc8806d5e942674",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d930g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d930g0v0Filler.json
new file mode 100644
index 000000000..2594b9509
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d930g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d930g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103a26064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x84d2455a9d0dd2cf4fadc4c8885fbcd92b203b13d82ae37a24341d67e99d84ee",
+                        "s" : "0x57a819cf9a6f147c8c88d02ecf3dc5e24003750006b9cad56a95dafa4f602acb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d931g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d931g0v0Filler.json
new file mode 100644
index 000000000..3314fef57
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d931g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d931g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103a36064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe53f542eddeb6392f41d763ff63f9ee04a399214953813361d5a06c1879e766e",
+                        "s" : "0x45250b2af9958bc5c1a19794388bb89fd52b4928e6e83b035e25215f8e4efb36",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d932g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d932g0v0Filler.json
new file mode 100644
index 000000000..e02db00b9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d932g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d932g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103a46064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x46c9b1eb647d2fc1b4c8d52b2344f300b220304d9e21aa95812d9449f1a635ee",
+                        "s" : "0x1416a273d9febeb2a4de1f1dbd4f3fd1ef7a76801da90b42452e56e5999e6618",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d933g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d933g0v0Filler.json
new file mode 100644
index 000000000..c92dc2251
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d933g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d933g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103a56064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x77e5f8b43809d6b279f2b87cde512f05920b73b3c398993dfd322958c59b218d",
+                        "s" : "0x02f8f08328ae47964e5ccc3314f5856d6fdb8c14037693dde64acde2b07752b1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d934g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d934g0v0Filler.json
new file mode 100644
index 000000000..9eeae24a9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d934g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d934g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103a66064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x38ec9439f808e1bc8d72eecdb87e43a344f961829272d08b5a6ec6d39602a95f",
+                        "s" : "0x432daddf813fb6486470aed4e4f3db41a42db82f7e944052848264f79f0c0049",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d935g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d935g0v0Filler.json
new file mode 100644
index 000000000..3c3b54c2b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d935g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d935g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103a76064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x09098067125cff13c8a80599573ae1894db9536446dd608a9854e5c7a828636c",
+                        "s" : "0x0628503993a1fe8e1f2e4184bbaa960baa513ab892a34c230516935bc2c8173b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d936g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d936g0v0Filler.json
new file mode 100644
index 000000000..21e82e762
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d936g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d936g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103a86064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x08a476534d954147a34ad2d2b32863b4ea8c15100e984d784ceabbfb5e4ae3b2",
+                        "s" : "0x75bbcaabd3a4d345679c78f539c8e032504f08d50d4407c09b5663fe1f608317",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d937g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d937g0v0Filler.json
new file mode 100644
index 000000000..9916323b2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d937g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d937g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103a96064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4dcfc5e78056ee3abf15fc1e1af780fd35339a568dfac2ecd372ce02a043a1e1",
+                        "s" : "0x5f34f682b30f3f550bea97f80decf2c568da918cd2bcf32e30cad633927e8610",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d938g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d938g0v0Filler.json
new file mode 100644
index 000000000..d79c8c641
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d938g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d938g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103aa6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x363cd261ee4cded2c61ad3319a19351169ddfd413cb1e6deea6aa086fced77fa",
+                        "s" : "0x5d015d0385b66f76613704f650c39d8d210c567dec5b11dd08832ac5a7ae0c61",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d939g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d939g0v0Filler.json
new file mode 100644
index 000000000..84e3ab06a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d939g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d939g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ab6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3fa8b10f6c7dfd80e74912e521e7a33b2a6413c9270fb98d56cb0b630b8cc9af",
+                        "s" : "0x3fe82e7542b6baf3148814cf041a6edef8d481494b512dec64743619301b34b2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d93g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d93g0v0Filler.json
new file mode 100644
index 000000000..819c8e0c5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d93g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d93g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x605d6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa8fe7ccfe9f7638ea90d3fe5707bd82da6545cba4b100451d01711c4866ed150",
+                        "s" : "0x647090a3d7a00368fb0a30cfe5465001b602ecddf7571fabb42b1cabe426f05b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d940g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d940g0v0Filler.json
new file mode 100644
index 000000000..d111bec99
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d940g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d940g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ac6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8dc2d7f3dd66e2ba2cfb63376f172d300a837bce1a10694791cc66af060ed95a",
+                        "s" : "0x42e112a516d569329bb6170b1e589df5d381f6162112d78f783cdf5fd18935bb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d941g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d941g0v0Filler.json
new file mode 100644
index 000000000..6c762809c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d941g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d941g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ad6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x594d28fe7a38eb58813083590c647f4446321e5c4efa10a94207531c962ff7b3",
+                        "s" : "0x43f47695b485c8c23b45ddfeb0aaf34f58a8a46b8f087b341de33414c40004ff",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d942g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d942g0v0Filler.json
new file mode 100644
index 000000000..16dc3f5a9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d942g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d942g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ae6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf665c9c282db363ef803cafd43b34032fe5edca28cab83da9dffcaf91010ea5c",
+                        "s" : "0x74f4c237b71c81ad99663da0a06b8ab702f96bc0ccbc7573d888768b172b29ec",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d943g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d943g0v0Filler.json
new file mode 100644
index 000000000..5a4fe2111
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d943g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d943g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103af6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6679a4cb60b70652aa46b0b69307496b714d8a403a90a285438ba9760262d849",
+                        "s" : "0x21b4780388de609a1c4c0896a20a48eb09b55d83fc3bce5f1142e93961a5844b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d944g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d944g0v0Filler.json
new file mode 100644
index 000000000..e060f8289
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d944g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d944g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103b06064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x36a9fa985aa8935529da805ab7e20e02d33e8638b1f5e2cf4e5acd359920218d",
+                        "s" : "0x5177d54fdc085c95351f4dcf8169165a22410d7ef3e16c53ad6a893365e87570",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d945g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d945g0v0Filler.json
new file mode 100644
index 000000000..972683856
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d945g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d945g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103b16064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa46c2be05f0b0ff30c9005a2c9f9e57d0796db023c953b474efa870320d56783",
+                        "s" : "0x29e1b1cbe580abdbf9f035aaa52ce1f3351e3d695e91932bb135391da087aa98",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d946g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d946g0v0Filler.json
new file mode 100644
index 000000000..a5e8910ee
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d946g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d946g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103b26064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa8bfbdba6bf6ca491ce58b30a2c95914921a048928a9548a7113269d8f6b6dbd",
+                        "s" : "0x4be9b939ec7372922fa7a7cc43f90536df7fe59c42b593e82c7071d1bc5d3427",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d947g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d947g0v0Filler.json
new file mode 100644
index 000000000..3ee99a98a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d947g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d947g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103b36064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0477b8602c5483680d6c023b1b66bec467165f949812d5f6111e62ee8f5e50e1",
+                        "s" : "0x40b5228aed5d71386d657de5fec950a6ab357559821854eb2fff19af4bb8dd7e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d948g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d948g0v0Filler.json
new file mode 100644
index 000000000..56a43e5e0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d948g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d948g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103b46064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3b1c61ca3db5283154a18b6108cab2a53e2e9a7bccf4551c19aac4606a91c92c",
+                        "s" : "0x63877cff081383c9092d5c62b346436018da369e13663fc7f65667b3dbb63b91",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d949g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d949g0v0Filler.json
new file mode 100644
index 000000000..a66299042
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d949g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d949g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103b56064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x969d03666bc2d3aef5b527c3a553b9a1a534d1a569a5374267051aaaa56df4db",
+                        "s" : "0x5fdc25ac9fe1244fc7abb30b2f83a9ad2a5a375790de4493b3ded2f6c7d43f8e",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d94g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d94g0v0Filler.json
new file mode 100644
index 000000000..9ba1e5fc9
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d94g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d94g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x605e6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9b3489819ce974863615bb5fb3b2252b95657a12aa79eaf4d1ef40ae6e678bed",
+                        "s" : "0xde93864e0af2cb2f3a69a43f17cb890b850e3b2acfde989e853e6365b598b2",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d950g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d950g0v0Filler.json
new file mode 100644
index 000000000..1dd8e27bd
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d950g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d950g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103b66064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8aa2633c4c44061306a1f419ce52aaebb4d211134fdf9d4d19c7afdb645c7199",
+                        "s" : "0x3fa533253000efc1bd9acee1f90975560e06ff977ea189afa1b2a3ea6708579f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d951g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d951g0v0Filler.json
new file mode 100644
index 000000000..cf584e608
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d951g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d951g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103b76064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc36a87d7ef564610f1bf82d3615dad5319ce8d177a8d70ca03fdc431c36236c7",
+                        "s" : "0x0e8ecaf81f467e4441a0e7eb8a22790b3844033015ac4fb76879f17644ef1700",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d952g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d952g0v0Filler.json
new file mode 100644
index 000000000..e5768b8c0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d952g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d952g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103b86064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xedc2d756a41d1bb7c1624547946ba64d25e1ba350f7382014fcceb1e65bb1e90",
+                        "s" : "0x1d7df40dcdbb17a4a1f6514afcc0bc9d326473ea6ba96ceea924976fb4207758",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d953g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d953g0v0Filler.json
new file mode 100644
index 000000000..d8855f476
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d953g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d953g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103b96064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xec89de06402c312ab2e5b292a5abf994791d40c39c8d7aec8a5b0997f461cccc",
+                        "s" : "0x2dee1291357ec65ae6cedf55dc8e2421c788a2ae2f93dde0e0da0fdd098f685b",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d954g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d954g0v0Filler.json
new file mode 100644
index 000000000..fdb9fb468
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d954g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d954g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ba6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7c65e64f9898e7c9dcdffd753f44f7d4bf6a748152583c0890c035edf41cc460",
+                        "s" : "0x36474da42219d015a166db6c30758d8d2898d345fa782cd677f45408d4a9c52f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d955g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d955g0v0Filler.json
new file mode 100644
index 000000000..4267f0179
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d955g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d955g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103bb6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0741d175fcc38d777ff64f40c0708f75d562f8d003a778308f694a40c2c2b1eb",
+                        "s" : "0x6aebd27aeff42f456a40582e74468d1b0a133ecb5d9778cceb62ac3a4befa1f0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d956g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d956g0v0Filler.json
new file mode 100644
index 000000000..7ce92a80f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d956g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d956g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103bc6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x19518d3cbf44f940218969d214640439207c4072f50057627be8104150ff8dc0",
+                        "s" : "0x32b847d8b7f684d6540aa2d8eafe880374976ba103b63562684728ec8daee354",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d957g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d957g0v0Filler.json
new file mode 100644
index 000000000..b84f6da0d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d957g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d957g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103bd6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdca390be208de456e0c0f39acec9baabd5606a9b340ef3ed918fb73b9f40310b",
+                        "s" : "0x34c06c8894332ea74af794dee4781f28c959582dac75ca004a7af55e657c94da",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d958g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d958g0v0Filler.json
new file mode 100644
index 000000000..4d770f360
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d958g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d958g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103be6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2e7fbe3309025229a1814d3a4c2d26ae51a8b0752103dacd89e90dd7fd89ca9a",
+                        "s" : "0x5a00036f2015d7299986a30fe16684937eb82415998a7b105c610a57067d530f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d959g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d959g0v0Filler.json
new file mode 100644
index 000000000..f221a8335
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d959g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d959g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103bf6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x48f649e2f7d043e753583cf62faed6ef458785194ce84c965327cadfc2029e01",
+                        "s" : "0x11ee7d3539b0686288416e06b602d0b03002b33a5bedc360c18ebb4d8dc0de6b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d95g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d95g0v0Filler.json
new file mode 100644
index 000000000..dc031e04a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d95g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d95g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x605f6064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfce7b55577aae455d3acfdea2d2c0b3411fc9b8aabc39ef806cc2027b121d7e6",
+                        "s" : "0x79b2932536fd29b4681056b2123951f7f1841bdf8da6bf55c7e9ffc629b0b19a",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d960g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d960g0v0Filler.json
new file mode 100644
index 000000000..31774bb63
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d960g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d960g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103c06064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf15d565a9843d4c5b96344fa5dc47455d81afe308b6ce32f014a9014a6518a65",
+                        "s" : "0x3afe5346ce88fe458b7ea9a7d7c26def4dfded60739eea343b2447b256285c96",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d961g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d961g0v0Filler.json
new file mode 100644
index 000000000..a656cd927
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d961g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d961g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103c16064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xabc995808f54b6dbfbca479aa4473298baf20ca9d76e0fee5fba6b0dbd59b7f1",
+                        "s" : "0x35d7c71e8f8b3ea1e39e6e7f4e8386b21b78fb4fa1c26ca4db44aef2054860d6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d962g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d962g0v0Filler.json
new file mode 100644
index 000000000..717ae3dd0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d962g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d962g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103c26064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3db97c7bb05c647c050a84135ed283737ab0f768366184878a0a3f16d61324d9",
+                        "s" : "0x7543f51653fbc4662037733ad04edfe653c72ba6d7cebbc4e34751440867ab21",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d963g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d963g0v0Filler.json
new file mode 100644
index 000000000..a1f3e0988
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d963g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d963g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103c36064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf059c2b62bda061351d129760089a6f7f66bd3e5af366a32896429d41d199b82",
+                        "s" : "0x18f6ee0f06880f6424f5708a56616743c167ea2c209d6d82f478c501dd0fc844",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d964g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d964g0v0Filler.json
new file mode 100644
index 000000000..e6a57853d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d964g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d964g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103c46064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x520321c9578ae52703e2ee67a56a845a309f0720c152a1665034462c9e126909",
+                        "s" : "0x3143c5e94b8e61ffdfa0f3fea55a7cb76b9426b9beafc3f3fbdc914f116c2c1f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d965g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d965g0v0Filler.json
new file mode 100644
index 000000000..33a3af14e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d965g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d965g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103c56064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5987d1c15f8fdf520aefeb108561fa20040935129d545a915fc986826c2e372e",
+                        "s" : "0x7d010684f6f80e4c93c97fd2439888927cdaa8317db9648ce23b81e12c91ec0e",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d966g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d966g0v0Filler.json
new file mode 100644
index 000000000..4a05b216b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d966g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d966g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103c66064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7ebf556770b2e32afee022931becccc9639eaa426cd8c22e5fb2a19ff282b9ef",
+                        "s" : "0x0a5d993417fd4fec7a860915e249187e4dce3fa724bf525f6af3688ac7da3889",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d967g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d967g0v0Filler.json
new file mode 100644
index 000000000..dd6d4c84a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d967g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d967g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103c76064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd21e5a31b73f410b3cdbdc3531e783d4f24723ad3e764703f976fb325e022561",
+                        "s" : "0x4466c4616cfd1de1c3380975884a10a993abef10d5d6bdfa2377a68533623262",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d968g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d968g0v0Filler.json
new file mode 100644
index 000000000..27013a145
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d968g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d968g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103c86064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe46704882a9438333bb86bab356bde6e7a7233a4642a02570a8c2ae162bbb7b4",
+                        "s" : "0x30b3df89d08f8d4b51db27804123d3fda8fda02866b3c01dcc5bae55795c02b9",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d969g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d969g0v0Filler.json
new file mode 100644
index 000000000..2ed672e14
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d969g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d969g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103c96064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1d1308d736a55c2a7eb9ebbaa22d1631e75b432f7c5392d719835f9d2ee77f11",
+                        "s" : "0x6b5d72bb34fad9ee1d643195c01d3c13c548ce6fbe3076aa4fd822d0138bca27",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d96g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d96g0v0Filler.json
new file mode 100644
index 000000000..e6241329f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d96g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d96g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60606064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0f4506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xea843353de6b71e891298bbc886209bc74f245fa14dfed0ca4b02d000e37d430",
+                        "s" : "0x4fbc0717a569b0436664c8600bd5af67ebd26122f2cdd9d200abdea7298d46d1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d970g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d970g0v0Filler.json
new file mode 100644
index 000000000..8ecde62b8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d970g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d970g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ca6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3374bc3a02dd476a015de84990fa7968dcc965b1c5b07927226046193d951e75",
+                        "s" : "0x5f975a652b7f10651994056ea0ffb570cd4c9d17de218b0aa89e3d76208a7a03",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d971g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d971g0v0Filler.json
new file mode 100644
index 000000000..05dc1365a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d971g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d971g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103cb6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb8d89cd415b486e3b73dafa748a525abb2f0bd177bfe8bd9dc5dbb8dacf42f42",
+                        "s" : "0x0b4e3a7ac4fe80e4d329dfababcd53ec970e7204f0f69a011ce61275c26a8b00",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d972g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d972g0v0Filler.json
new file mode 100644
index 000000000..b50794ef6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d972g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d972g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103cc6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0aa0628ee4e2810b550e3cfbfa46796f7e30a12144d3ae2664ce2454ec828140",
+                        "s" : "0x6b083b93ccc23dce6a87957fc2d6c04ed90ccb87c15c674de2b9dafa747fca0d",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d973g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d973g0v0Filler.json
new file mode 100644
index 000000000..2b66ad492
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d973g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d973g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103cd6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc2aeaddb1c823128fc36de31582307f52c79615647809ebcd0e00a534c04b428",
+                        "s" : "0x5734ec3899b59a236fc7e9031efb6c25a6f54284dbba5230f1da6efe866d3660",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d974g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d974g0v0Filler.json
new file mode 100644
index 000000000..d619aa20c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d974g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d974g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103ce6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbeb288be5d7d245b93df94b22968cc02131373fa7910170748a19daf07d3868d",
+                        "s" : "0x59bbdcacb846503e738c68f99e36b5128a4543534b030466ec094cb416e5b8a7",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d975g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d975g0v0Filler.json
new file mode 100644
index 000000000..b2966b060
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d975g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d975g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103cf6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9d6f9898f1f2106242bd8abb23f1379d8faccfaf320adec515858f3422d256ab",
+                        "s" : "0x2e127fc49fe94c02ea2d19649880ac44cbbb680edb4014512f69d673402f3fd2",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d976g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d976g0v0Filler.json
new file mode 100644
index 000000000..885b9a477
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d976g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d976g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103d06064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb9fadfd7fb0414bc7a86b408d4f0cd104b7e32e0ecbcbcaaaa8f89f8739129c5",
+                        "s" : "0x22c3d8a1bf4b57a284e08233e2f3b5bf0774fe539c7f8ea5a52c4b8098b40236",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d977g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d977g0v0Filler.json
new file mode 100644
index 000000000..c991e6d08
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d977g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d977g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103d16064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8a6b1c881da12489727b9194db85fb5b9de53474b5fd3472f4a48aef28e5dade",
+                        "s" : "0x70637806f829422c3b83295f416bf04fc394a80ce5a2d9ec7db13e8daadb6dd9",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d978g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d978g0v0Filler.json
new file mode 100644
index 000000000..2e6a47130
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d978g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d978g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103d26064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8c353d08ec055f6e58a724105dc9d2410b1a120d3f8ca95a0096110c8baff94a",
+                        "s" : "0x1df7ec83a4ab72335f686497580cdb9d47f96b919fd982369a9d19aab74faf7f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d979g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d979g0v0Filler.json
new file mode 100644
index 000000000..5f8667c96
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d979g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d979g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103d36064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbb12c0997084eaed399d630d6c053bb3d9f1316d13a75eca8abe3ecac353af9f",
+                        "s" : "0x742da23b078443b62f77759a93c4bf529996fed0e57f8aed09c748826346bc8d",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d97g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d97g0v0Filler.json
new file mode 100644
index 000000000..4bead145e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d97g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d97g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60616064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x510778c7487319633f2a5e597b23a9f985175b7f3844063357a3f10857f0f6a2",
+                        "s" : "0x77e075a8a36dada4beb212fd8519fa5381d08a9d9fb18722de8481da786e2cfe",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d980g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d980g0v0Filler.json
new file mode 100644
index 000000000..445b8fd1b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d980g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d980g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103d46064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe348d2d25699801763f4dac9e22ee05cc2aa53eb261060b970946fb2ae688cff",
+                        "s" : "0x114d342fb5022576904564a8da9939b34fb6bde8030279f851be25d339d97993",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d981g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d981g0v0Filler.json
new file mode 100644
index 000000000..1ea8e74b4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d981g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d981g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103d56064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x038186b62c9b41fd9e6fc671f7a026b35b9f089fbf47bf401b8f2ede89c58f22",
+                        "s" : "0x01dc69488bc393014220e69064915f9bea16fe19937cade5cc2f4532b09ce732",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d982g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d982g0v0Filler.json
new file mode 100644
index 000000000..4f9995de0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d982g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d982g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103d66064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x17b3a9999575e5571faaa394fb5825826167165e4daa278b1b9ecf2cca268b1f",
+                        "s" : "0x36191e398fdd24be53b20662d4aa5af728875b7113cd05af6b4d3b67fe6e64a1",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d983g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d983g0v0Filler.json
new file mode 100644
index 000000000..76c48e5ac
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d983g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d983g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103d76064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3d071cc6b2ba157facc69ca4b413890d9166ade759bab84cdb8f26cb189d3eb8",
+                        "s" : "0x6f73e879fe1cc06c762388826737312aba18d0a0f56ca9447070439ae57db739",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d984g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d984g0v0Filler.json
new file mode 100644
index 000000000..3a3b94344
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d984g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d984g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103d86064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f1506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc456a85e760e6f8da6063b65533b4578f022bf7681aa21199212022e8faff726",
+                        "s" : "0x7becd7bb165381aa5fe35221655ddda5f123f0d8a0fd6365416230f417e629f3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d985g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d985g0v0Filler.json
new file mode 100644
index 000000000..7b0aaca52
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d985g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d985g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103d96064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xda8e0b07d820da88d70df30e96538417082dede307ba957e04c6613abd578efb",
+                        "s" : "0x5308f6f692d86a10592ce30402831926d37517426f2a6f6c34da0a92d7ece2a1",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d986g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d986g0v0Filler.json
new file mode 100644
index 000000000..7e8358582
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d986g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d986g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103da6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x62b0be2e5372539f990e86df77fedd0788baddd70b1660039bbed9848b23c811",
+                        "s" : "0x679edea1d8da29e6e269c3b438a2bc5c8d2cda5e171a483ddae0aa86d1f20a5f",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d987g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d987g0v0Filler.json
new file mode 100644
index 000000000..739ff2b06
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d987g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d987g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103db6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5b0e825956bc0a9b230f59565659659f08cbaddd467cc28988bcb85f4dbcfa4a",
+                        "s" : "0x43cba33d4c852e0057ede5158517c97a8c4af70cbc366cb9a047d5ad9f57dd09",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d988g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d988g0v0Filler.json
new file mode 100644
index 000000000..7a2210f95
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d988g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d988g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103dc6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000731000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6d6d2b4685b13b74984846fdb967a66c2c64a517be743820e679bf2d0c29bbec",
+                        "s" : "0x4ce2c307562fe00a299a7e6bb4263fada7c7a4544fdd9f70ed9d139535c1ecb0",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d989g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d989g0v0Filler.json
new file mode 100644
index 000000000..be0d1a33e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d989g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d989g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103dd6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa5a9fba58ad841875019c2a0d1e2375f9b4403253dbe167937273b9e1ce9ce3a",
+                        "s" : "0x22b12c293a19186724fff9bcb3d5899fefab1bc93c5104da43f29c62cd8d3604",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d98g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d98g0v0Filler.json
new file mode 100644
index 000000000..6e43adcd6
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d98g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d98g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60626064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8214a2baf1771f9ddf5a19d445f99c82bf20de8f948d93b24e249f7cea73d3c2",
+                        "s" : "0x561cdc6d3d994aeb3e37273e59287f4cc121b7c6179a55a9c8a0f65def39b123",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d990g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d990g0v0Filler.json
new file mode 100644
index 000000000..afe460e63
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d990g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d990g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103de6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f25060006000600060006000733000000000000000000000000000000000000000620493e0f25060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa8e502698b8d62078a4911d7d547822102abe383910c66a290f072db6bcce7d2",
+                        "s" : "0x2a37d95390773bd2c31733180bc1f83707c5f72f69d0a8fa45ef80a77f57e7a3",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d991g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d991g0v0Filler.json
new file mode 100644
index 000000000..9f1d2b8fe
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d991g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d991g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103df6064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x94dc4f74a5dc418495b57b68a7f393f19524541ac254cc3904ddd862fdd4f228",
+                        "s" : "0x6015fc3d6aebc168e3383a98afc88183866220687ed78693446bbd1e25859336",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d992g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d992g0v0Filler.json
new file mode 100644
index 000000000..980213361
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d992g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d992g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103e06064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf536546d116a0ff1a0be7b0698a76d4b5eea3612aa5c4fa68fc5116731e81a43",
+                        "s" : "0x24e62e201a6571b0ec2e739816cce1cf8ebc12446cb74e1c2a52ac3336a9fca6",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d993g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d993g0v0Filler.json
new file mode 100644
index 000000000..ea86c8118
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d993g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d993g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103e16064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6acd95045690850967d3ee40beea002523cdd66001a2363f6ae57269b2d30cc6",
+                        "s" : "0x66121c87cbdd27932d760c00c4dff57ea97067868a8a1e58652caeb96e1e01c0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d994g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d994g0v0Filler.json
new file mode 100644
index 000000000..7e8656ad5
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d994g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d994g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103e26064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000731000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1baa137c76420ab1c19ee13fd28790c2f1c4199f1ced161be2da844abebe16de",
+                        "s" : "0x5f4436e3ff726bcbf31b8b9b8185846f96134bf106d93faab2e2b8d64e625237",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d995g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d995g0v0Filler.json
new file mode 100644
index 000000000..c4760ae4e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d995g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d995g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103e36064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000732000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfacfb75047693e462060e28d0c3f1d550028b9a5fd8103e8b772d275c6006fd8",
+                        "s" : "0x1235018fb9580c37a340be5cf7b0bbee0baa56ca0f96fc21ac436596feeb677c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d996g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d996g0v0Filler.json
new file mode 100644
index 000000000..efe849764
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d996g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d996g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103e46064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f4506000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0fa5060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd18acdf86cce5256c4647ad14f88c9ccfa04e6a6c2018f4a416b16284e55a80f",
+                        "s" : "0x010f91ac13dd4a60f35f97e65357394054abd30c6de5d07681e8772e57a40e38",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d997g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d997g0v0Filler.json
new file mode 100644
index 000000000..e2b5959ee
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d997g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d997g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103e56064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000731000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8ff3cd457ecaa795da4ad9d1ef44128a7aef6108ecfa084df3479e7e12522f2e",
+                        "s" : "0x6db40667d5bf5b594ec0b64e288edd33e8dadea498e7df5ef3827a02ba9c79cf",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d998g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d998g0v0Filler.json
new file mode 100644
index 000000000..7c9a2418d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d998g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d998g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103e66064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x383cf0ef71f2e050d35d89324d96bc56067d7ef736a516c1b254754fd7a13970",
+                        "s" : "0x4225a0cbf52d732b1674c2e51f1317ac1c2b6219b0d32b7560e0418a87359e10",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d999g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d999g0v0Filler.json
new file mode 100644
index 000000000..a7613c15b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d999g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d999g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x6103e76064526000600060206000600073b200000000000000000000000000000000000000620493e0f2506000600060006000733000000000000000000000000000000000000000620493e0f450600060006020600073b200000000000000000000000000000000000000620493e0f45060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x19acf9fec65ac0f72bbadbac917e6fb657a2fc33c9aab796a96abfdde1bf43b9",
+                        "s" : "0x421b608590ee64e2ec118bb8dbf3526fe0aa3b30aadf87db5e2f67c678c4e76b",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d99g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d99g0v0Filler.json
new file mode 100644
index 000000000..4c14c0e7d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d99g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d99g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60636064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000733000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa5060006000600060006000733000000000000000000000000000000000000000620493e0f15060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe61cbfbf6c357fd208aff84a3d02d7ca8c2a3fb50879c93d003f2c661a224624",
+                        "s" : "0x66be13fa673a17994aafdfd246396a0a0ae99c3349932ac4d2f24912722ca53c",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d9g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d9g0v0Filler.json
new file mode 100644
index 000000000..0834d33fb
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stSStoreTest/sstore_combinations_initial2_d9g0v0Filler.json
@@ -0,0 +1,128 @@
+{
+    "sstore_combinations_initial2_d9g0v0" : {
+        "_info" : {
+            "comment" : "sstore 2 -> {calltype} -> change to {0, 1, 2} |-> {calltype} -> {non, oog, revert} |-> {calltype} -> change to {0, 1, 2} |-> {non, oog, revert}"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x60096064526000600060206000600073b200000000000000000000000000000000000000620493e0f15060006000600060006000731000000000000000000000000000000000000000620493e0f150600060006020600073b200000000000000000000000000000000000000620493e0fa506000600060006000733000000000000000000000000000000000000000620493e0f45060006000600060006000732000000000000000000000000000000000000000620927c0f1",
+                        "gasLimit" : "0x1e8480",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe88328c87ef59678a1904f04f9b00b8ce11a25ba4c6ab821f50366022b58c4a7",
+                        "s" : "0x60ceb9bed13f4104ad3184673d2134a6f9d31837f388f3dcd27c227392e72593",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x2000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600155600060015560016002556000600255600160035560006003556001600455600060045560016005556000600555600160065560006006556001600755600060075560016008556000600855600160095560006009556001600a556000600a556001600b556000600b556001600c556000600c556001600d556000600d556001600e556000600e556001600f556000600f55600160105560006010556001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01"
+                }
+            },
+            "0xb200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560016001556002600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x02",
+                    "0x01" : "0x02",
+                    "0x02" : "0x02"
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
-- 
cgit v1.2.3